handle empty and double headers
bumped version
Merge branch 'release/0.3.1' into develop