fixing #17 working code, writing tests
fix #17 and #18 include tests
fix #17 and #18 include tests
Merge branch 'develop-0.3.2'