fixes
Merge pull request #11 from zimmerst/integration

fixes