Merge remote-tracking branch 'remotes/origin/master' into tests
cleanup
Merge pull request #4 from Nazgard/master

Merge pull request #3 from Nazgard/tests
Merge pull request #5 from Nazgard/tests

Tests