Aug26 patch
Merge pull request #89 from particle128/master

Aug25 patch