[master] improvede parse function