fixed rotation bug.
Merge branch 'master' into dev
rename manager to pool
Merge branch 'master' into dev