multiple edits
more edits
various edits, including Android shoutout
updated with Jason's feedback
fixing merge conflicts
Merge pull request #86 from bernii/master

Fixing merge conflicts of another pull request