Added content. fixes #1 and fixes #2