Update on parser
Merge branch 'master' of https://github.com/hugle/SPA_NAVI