Pull Request for Issue620

Commented out code should be removed if not needed anymore.