fixes #10
fixes #2
Merge pull request #14 from hpxmlwg/bugs_to_fix

Bugs to fix