Better handling unexpected data
Bump version number
Merge branch 'release/0.2.7'