updates to address #65 along with some additional specs
Merge pull request #66 from btm/GH65

fixes #65 along with some additional specs