More logging!
Merge pull request #470 from drtshock/master

More logging!