travis test 1
Merge pull request #9 from curiousepic/master

travis test 1