Making this trip more useful by trying to make Travis not fail.
Closed #31.
Merge branch 'issue-31' into dev