fixes. merge w/ line version
Merge pull request #14 from zimmerst/integration

fixes. merge w/ line version