Aug 13 patch 2
Merge pull request #76 from particle128/master

Aug 13 patch 2