patches for issue #4 & issue #6 

Integrated the patches earlier sent via trac in my fork of gcovr. Also made minor test update for missing folders.

Please let me know if you have any comments.

BR Robert