addressing issues raised by @mikemcquaid
Merge pull request #4 from PatrickRoumanoff/master

addressing issues raised by @mikemcquaid