Make default controller method configurable
Delete Parser
Add parser
Merge branch 'develop' into feature/controllers