#1: Added function prototypes to generated header file
Merge branch 'dev'