cleaned up things so that they compile
Merge pull request #1 from hugoestr/master

cleaned up things so that they compile