Instrumentation enhancements.

This is a patch for issue #32.

Apologies for the modified .csproj file, Visual Studio only ever seems to get in my way.