Merge pull request #1 from fanian/master

ok