#2 fixed
#7 fixed
#5 fixed
Merge branch 'feature/2' into develop