Refactored Parser with custom Action classes
Merged refacted Parser from develop branch