Basic stuff
Merge pull request #1 from cclough715/master

Basic stuff