Added parser and unit-tests