kicking travis-ci
Merge pull request #52 from fusion94/master

kicking travis-ci