resolves #1 - almost rewrite, lol
Merge pull request #6 from tunnckoCore/master

resolves #1 - almost rewrite, lol