updated changes with tabriz 1.3
Merge branch 'master' of https://github.com/entirej/incubator