Feature #230