Fix #36
Merge branch 'master' of github.com:rutvijkumarshah/WatsiAndroidApp