From nik1.
Nik2.
Merge pull request #2 from niklasi/nik

Nik