fix issue 4, finally
Merge pull request #17 from ideadapt/integration

fix issue 4, finally