Merge pull request #335 from FWAJL/feature_housekeeping

Feature housekeeping
Merge pull request #338 from FWAJL/dev

Merge pull request #335 from FWAJL/feature_housekeeping