Semi final points.
Merge pull request #63 from follesoe/master

Semi final points.