Bumped version number to v0.5.4
Merge branch 'development'