Merge pull request #1 from Ewait/master

e_wait commit
Merge remote-tracking branch 'origin/master'