trololololol
Merge pull request #2 from lonnen/master

trololololol