Merge remote-tracking branch 'upstream/master' into supportrequire
Adding in support for @requires. fixes #61
Merge pull request #62 from jonathanKingston/supportrequire

Support @requires. fixes #61