Merge pull request #50 from ryayak1460/master

Including Travis-CI setup.