Merge pull request #8 from cobertura/master

Merge latest trunk.
Fix issue #40 part 2
Merge pull request #50 from christ66/master

Fix issue #40 part 2.