Merge pull request #584 from dhardy/0.5

Prepare 0.5.5 release