fix
Merge pull request #8 from zimmerst/integration

fix