...
Merge branch 'master' of https://github.com/rsenn/shish
Merge remote-tracking branch 'origin/master' into arith