fixed functional header not included
Merge branch 'develop'