re-merge properly
initial import of xmh-1.0.5
initial import of xmh-1.0.4
initial import of xmh-1.0.1