Sep 30 patch
Merge pull request #98 from particle128/master

Sep 30 patch