bugfix
Merge pull request #17 from zimmerst/integration

bugfix