Fix for https://github.com/Rise-Vision/common-header/issues/92

Fix for https://github.com/Rise-Vision/common-header/issues/109
Merge pull request #151 from settinghead/master

Fix for https://github.com/Rise-Vision/common-header/issues/92