implemented feature #44