Merge pull request #53 from RobertWalsh/original_master

Updated project and added .travis.yml for Travis CI integration.