Finish part 2
Merge pull request #7 from celic/part2

Part2