content updated taking into account issues #159 and #160