Add comments.
Improve support for namespace imports.

Support optional parameters as well as parameter modifiers.
Merge remote-tracking branch 'origin/master'