Added project files for Android Studio.  Refactor test.
Added comment.
Fixed NullPointerException catch (missing variable name).
Merge pull request #1 from dsokoloski/master

Merging my changes