Merge pull request #154 from theresaanna/master

Z defined term parsing: part I
defined term positioning shouldn't reflect xml tags