Merge pull request #17 from pradpnayak/MTE-16

--MTE-16, merged 1.2beta branch to master
-- more work on MTE-16