Getting up to speed with Android dev so I wanted to tackle Issue #302.
Merge branch 'issue302'