[Commits] [McLachlan]McLachlan branch, rewrite, updated. ET_2013_05_v0-28-g314fcb3