Merge pull request #32 from tomwayson/master

updatd added travis CI support