testet
Fixed merge conflicts
Merge pull request #5 from buren/max

testet