Merge pull request #25 from jouvin/13.1

Update to 13.1.2 + some fixes to improve compatibility with versions >= ...