Merge pull request #75 from particle128/master

Aug 13 patch
Aug 13 patch 2