Merge branch 'master' of https://github.com/s-p-k/subfix