Merge pull request #6 from nitramyngiled/master

Merge pull request #4 from cecele/master