Merge branch 'master' of github.com:morbidick/loc3