Merge pull request #28 from klaernie/improveDoc