Massive change to header
Merge branch 'master' of https://github.com/jildertschilstra/meeuw