Merge pull request #15 from Thorgar/master

Get new Master