Dropped extra header
Merge branch 'develop'