debug mode optimized
Merge pull request #27 from Mafarricos/master

debug mode optimized