Part 2 done
Merge pull request #2 from yngvebn/Part2

Part 2 done