Merge pull request #81 from sparrovv/patch-1