implemented parser class
Merge branch 'master' into parser