Fixed Build Problem with XUnit

Merged Dev to Master
fixes #4