fork fixes
Merge branch 'master' of github.com:lancegatlin/smach