Merge pull request #11 from freiphone/patch-3