Started objective 2
Merge pull request #2 from fredriklind/objective2

Objective2
Merge with master