Update on PR #40

Commented codes removed.