Merge branch 'master' of https://github.com/kgallagh/sqwok_misc