Fixed crash when no state existed
Bump Version
Merge branch 'release/v0.5' into develop