parsing fix
Merge branch 'tags_27102014'