Merge pull request #1 from MatterHackers/master

Updated code from Master