Added fixes discussed in PR #70
Merge pull request #71 from mikewesthad/master

Added fixes discussed in PR #70