Swap args in 'new.tmat'
Swap args in 'new.hmat' (in calls)
Merge pull request #24 from eodus/cleanup

Cleanup