merged
Merge branch 'master' of github.com:Erotemic/local