Solved #54
Cleaned up #54
Delete debug file