squaring up
Merge branch 'master' of ssh://github.com/liamconnor/ch_misc_routines