updated parse
Merge branch 'master'

Conflicts:
	plugin.xml