Upped version to 0.8.4
Merge branch 'release/v0.8.4' into develop