Merge branch 'release/0.2.5' into develop
Handle nil data
Bump
Merge branch 'release/0.2.6'