Merge pull request #1 from newsdev/master

Sync up with Derek's latest
Removed the include Statement declarations that were breaking scoping
Merge pull request #7 from harrisj/master

Removing the include Statement declarations