Pick up later
Minor renaming
Merge branch 'master' of github.com:abagwan/CTM