Merge branch 'master' of http://skoegl.net/uni/numpty