Feature/issue#11