Merge pull request #1 from freiphone/patch-1