Better logging and minor bug
Merge branch 'master' of github.com:ladderframework/LadderFramework