Feature/issue15