Moved parser methods to separate module
auto-merge staging into master