Aug 21 patch
Merge pull request #86 from particle128/master

Aug 21 patch