Merge pull request #23 from djuretic/rewrite

More unit tests
add .travis.yml