Feature/xz

For Issue #43