#12 fixed
#11 fixed
fixed #6
Merge branch 'feature/11' into develop
Merge branch 'feature/6' into develop