Merge pull request #24 from jgoley/jonathan

Fixes issues on orientation change
Fixes "what does it do" list