Merge pull request #104 from dreamteam69/master

Debug