Fixed issues #13 and #15.
Merge branch 'master' of https://github.com/timrdf/pml