Added logging
Merge branch 'master' of github.com:phonga/framework