tobi 90% finished
Merge branch 'master' of https://github.com/coopie/Nick