Removed commented out code
Fixed issue #11