Merge pull request #40 from adamn/development

Merge pull request #39 from adamn/master
Copyright Updated
Changes...
Whitespace
Merge pull request #41 from adamn/master

development merged to master