improved integration
Merge pull request #22 from mkotov/master

improved integration