Added Feature

Close Feature #392