Merge pull request #1 from echowaves/master

update
Merge pull request #2 from echowaves/master

update
Merge pull request #7 from sndive/master

Merge pull request #1 from echowaves/master