Merge pull request #1 from MatterHackers/master

Updated code from Master
Merge remote-tracking branch 'upstream/pr/5'