Merge pull request #3 from tobbelobb/master

Further theory
Olofs andringar
Small commit
Lite grejer
Merge remote-tracking branch 'upstream/master'