Version bumped from 0.5.3 to 0.5.4
Merge branch 'release-0.5.4'