Added a TODO
Fixed issue #8