Merge branch 'master' of github.com:3-Round-Stones/callimachus