travis fix and added more tests
Merge pull request #13 from kc1212/develop

travis fix and added more tests