jsut one more test left... :)
resolved #39, needs testing on fred's project :-)