Features and minor fixes
Search header
Merge branch 'develop'