Minor changes to epicparser.py
attempting to merge Hareesh's code
completing merge of Hareesh's new code
Merge branch 'master' of https://github.com/puconghan/plt