Fixed bug that failed to recognize the correct header type.
Merge branch 'test' into dev