merged repo with latest fixes from arn354