TR1 Wrapper and Cleanup OT_ME
Merge pull request #61 from da2ce7/master

TR1 Wrapper and Cleanup OT_ME

This should be quite uncontroversial, merging now.