stuff
Merge pull request #24 from kristhus/serious

stuff