Fixed #94, Implemented TODO comments