initial code
Merge pull request #1 from ChrisMissal/master

Initial code