#5 fixed
fixed #9
Merge branch 'feature/9' into develop