Merge pull request #3 from julian-upc/master

actualize 5.12.
Merge pull request #110 from jan-fiser/master

Merge pull request #3 from julian-upc/master