Aug 1 patch
Merge pull request #72 from particle128/master

Aug 1 patch