Doin stuff
Added tests
Merge pull request #1 from dzoba/master

Doin stuff