Merge pull request #18 from Synchro/devel

5.2 tweaks