Feature/issue #5