Feature #31 added