Better logging for Issue #34
Merge branch 'master' into TFS2013
Merge master->TFS2013