Merge pull request #16 from Thorgar/normansBranch

Merge pull request #15 from Thorgar/master
Merge pull request #17 from Thorgar/master

Merge pull request #16 from Thorgar/normansBranch