Merge pull request #1218 from christav/release-0.8.4

Version number updates for release 0.8.4