Merge pull request #6 from janm399/master

Better ScalaDoc