Debugging update
Merge branch 'master' of github.com:atamis/flaming-cyril