Merge pull request #56 from t32k/develop

Develop
update parse function arguments