Merge pull request #9 from heuermh/master

Prepare for 1.8.4 release