bugfixes for common header
Merge pull request #60 from Rise-Vision/bugfixes-for-common-header

bugfixes for common header