Fix issue 26

Fixes #26
Probably remove the commented out code