Align features
Merge pull request #110 from iocanel/feature-fixes

Align features