Add Parser
Update Parser
Merge branch 'master' into develop
remove maybe type
remove kind