Fixing up things so it actually runs
Merge pull request #2 from jemartti/master

Fixing up things so it actually runs