Merge pull request #5 from enuilin/master

Merge start debugging
Merge pull request #6 from Tzigarroth/master

Merge pull request #5 from enuilin/master