Edits.
Merge pull request #39 from rudimk/droidcon2014

Edits.