Merge pull request #67 from Hasimir/master

added xyz
Merge pull request #68 from Hasimir/master

assorted fixes and docs updates