Merge pull request #1 from niklasi/nik

Nik
From master1
From master2
From master3.
Master4.
From nik1.
Nik2.