Merge pull request #9 from serginator/master

Integration with travis-ci