Feature/3 jan parser

#3