Merge pull request #46 from Daikatana/master

Cosmetic changes.
Removed debug drawing.

Debug drawing commented out.
Merge pull request #14 from MikePaNtZ/master

dev merge