Updated on PR #40
Removed commented code that Jameson commented in PR #40