Implemented feature/issue #53