Merge remote-tracking branch 'upstream/master' into supportnamespace
Adding in support for @namespace. fixes #53
Merge pull request #54 from jonathanKingston/supportnamespace

Support for @namespace