Merge pull-request #239
upgrade to  version 3.0 and initial XA implementation