july30 patch
Merge pull request #70 from particle128/master

july30 patch