Merge pull request #6 from rhyolight/test3

Test3
Merge pull request #8 from rhyolight/master

travis
Update .travis.yaml
Update .travis.yaml
Merge remote-tracking branch 'upstream/master'