Feature/parser type

#13