broke some things
Merge pull request #2 from adamhajari/master

broke some things