Updated tests to reflect new Config option
updated version number
Merge branch 'release/0.5.4'