Update the testbranch with latest fixes #98

Closed f3cuk closed 10 years ago