Merge pull request #460 from oleost/oleost-Features