fix projection
merge
merge from kejing/dev-2.0