Merge pull request #5 from buren/max

testet
Merge branch 'master' of github.com:buren/test into max

Merge.