Merge branch 'master' of https://github.com/critcel/corebuilder