Fixed two changes in #3 and #5 that were causing Travis CI to fail.