Added some specs and more refactoring
Added Travis CI badge