Feature/issue#16