Merge branch 'release/v0.1.5' into develop
make a function with proper defaults
Merge branch 'release/v0.1.6'