Merge remote-tracking branch 'upstream/master'
Adding support for optional type and name for @const and @constant. Fixes #43
Merge pull request #44 from jonathanKingston/namesupportforconstant

Name support for @constant