Updated version to 1.2.5
Merge pull request #134 from ChristofferL/master

Updated version to 1.2.5