Fixes for issue #3
Merge pull request #4 from ryanneufeld/issue3

Fixes for issue #3