Refactoring, optimization
Merge branch 'master' of git://github.com/flame-org/Framework