Add parsing exception
Merge branch 'develop'
Edit files