Adding stuff
Merge pull request #30 from acdevine89/master

Adding stuff