Merge pull request #15 from Thorgar/master

Get new Master
Merge pull request #16 from Thorgar/normansBranch

Merge pull request #15 from Thorgar/master