fixes
Merge pull request #37 from jmdetloff/john/fixes

fixes