minor changes.
Merge pull request #9 from zimmerst/integration

minor changes.