Fix for post init
Merge branch 'master' of github.com:phonga/framework