Updates from MacBook
Merge branch 'master' of github.com:rohantheman/tme2