AC: new changes
Merge branch 'master' of github.com:emclab/projectx