some refactoring
some fixes
Merge branch 'master' of https://github.com/forzi/render