Fixed a build problem from the last commit, along with a couple of other
things missed.
Merge pull request #19 from jpav/master

Fixed a build problem from the last commit, along with a couple of other