Merge pull request #4 from ubermichael/master

Personally tested commit 86a2896. ubermichael tested commit 4490085 for initial work on Travis setup.