Merge pull request #117 from fredrikpersson/master

Updated version number to 1.2.1