Aug 20 patch-2
Merge pull request #84 from particle128/master

Aug 20 patch-2