implemented feature #46