Parser

fixes #48 
fixes #60 
fixes #26