close #1
added tests
Merge pull request #1 from napile/master

Update from brunch