Minor changes. 
Addition of comments in methods.
Removed log trace from Parser.
Merge branch 'kostas'