Merge pull request #1 from siren186/master

Merge pull request #78 from siren186/master