Merge remote-tracking branch 'upstream/master'
Adding in support for @name. fixes #51
Merge pull request #52 from jonathanKingston/supportname

Support @name