Surface use Draw.rect and minor fixes
Merge branch 'master' of https://github.com/black-duck/Prisma