Added XMP test.  closes #23
Merge branch 'issue23' into devel
Pep 8 work.