Merge pull request #8 from richtera/newMerge2

Rebase of docWithTypes plus fix