Did some stuff!
..

..
More crap!
Merge pull request #4 from spocke/master

Did stuff and arne did stuff!