Closes #16
Merge branch 'enhacenment-#16' into develop