Splitted parser in 2 parts
Merge branch 'parserbranch2'