Merge pull request #17 from kostya-viktorov/master

If this works, I might pee myself.
Okay, then. Should be all good.
Merged with Kostya's
Merge pull request #6 from praccu/master

Updating