Update the testbranch with latest fixes #90

Closed f3cuk closed 10 years ago