Fixes #87 ( Removed debug code )