Merge pull request #141 from fredrikpersson/master

Updated version number to 1.2.6