merging PR #45 and editing the text