Bump up version number
Updated changelog
Updated tests
Merge branch 'release/0.8.4' into develop