Fixed #11
Fixed #15
Merge branch 'bug-fix-#11' into develop