Merge pull request #335 from FWAJL/feature_housekeeping

Feature housekeeping