Merge pull request #648 from billhollings/master

Add additional performance and call tracing options.