Merge pull request #11 from linkerlin/master

added travis-ci support
Merge remote-tracking branch 'upstream/master'