added parse
Merge branch 'integrate_parse'