Feature #59, implemented feature