Merge pull request #7 from freiphone/master