Possibly fixed issue #36

However, did I break the thing for linux and mac?  Let's see if I broke
the travis build.