Merge remote-tracking branch 'upstream/master' into supportmember
Adding in supprort for @member and @var. fixes #55
Merge pull request #56 from jonathanKingston/supportmember

Support for @member and @var. fixes #55