works on dev
fixed active rendering issues
Merge pull request #16 from xiekevin/master

works on dev