pull request to merge main tmk changes to my fork, 9/24/2013