Implemented feature issue #156