Merge pull request #57 from graimundo/5.2

Fixes from master