jedrick's stuff

asdf
Merge pull request #9 from Vandenn/master

jedrick's stuff