Misc.
Misc. 2
Merge pull request #3 from Lilleengen/master

Thanks!