UPDATED
Merge branch 'master' of github.com:brianbrunner/omg