merging Issue31, which adds disclaimer text, and regenerating