Feature/issue #30