Trunk was merged into this branch and 'tested' again. Seems to work... Now ready to merge back into the trunk. Needed for ticket #9