Feature/issue#62