Alternate text: Hamlet. Some cleanup.
Merge branch 'develop'