Bump version number
Update changes
Merge branch 'release/0.5.4' into develop