feature #49