Feature/simple parser