Merge and fix
Merge branch 'master' of github.com:jzbontar/ref