corrections to previous commit. Works now, promise.
Merge pull request #34 from jam2767/master

corrections to previous commit. Works now, promise.