Cleaned from debug code. Ready for pull request