.net3.5 Compatible
Test Domain last piece removed
Bugfix and Optimisations