Close Feature #440

Close Feature #440