Merge pull request #155 from theresaanna/master

defined term positioning shouldn't reflect xml tags
bug fixing and expansion of def term parsing