An attempt to address issue #108

comments in code