Small fix
Merge pull request #116 from SmokyBob/issue83_take2

Small fixes