Resolve feature warnings
Merge pull request #156 from phaller/topic/feature-warnings

Resolve feature warnings