new add.
fix for #29.
Merge branch 'feature/issue-29' into develop