Merge pull request #8 from hptaurus/master

update
Merge pull request #3 from fr3ndyl33/master

Merge pull request #8 from hptaurus/master