Merge pull request #399 from Smoothieware/edge