merged changes from fork skrieter.
added support for javadoc generation with module comments.
added context merger