Merge pull request #1 from hemslo/develop

Basic functions
Add travis-ci