Adds support for single and multiline comments #2
Renames plugin references in source
Bumps version
Merge branch 'master' into release