updated some code. 2014-12-16 By MACZ
Merge branch 'master' of https://github.com/newmcz/ETMS