Kewl st00f
Merge branch 'master' into kewl
Merge branch 'master' of github.com:germanchocolate/temp into kewl