Merge pull request #400 from Smoothieware/multitool