Merge pull request #1206 from Cadair/0.5

Release v0.5.2