Start of the merge
Merge pull request #68 from WannabeSid/master

Start of the Merge