Merge pull request #2 from fredriklind/objective2

Objective2
Merge branch 'master' into objective2