Pullrequest02

Some fixes to finish the merge