Aug 20 patch
Merge pull request #83 from particle128/master

Aug 20 patch