Merge pull request #1 from knoglen/master

TEST pull request
blah
Merge pull request #1 from MCBAS/master

Update from upstream