Fix for #119

Also addresses #125 (as much as is feasible)
Merge pull request #171 from harward/iss119

Fix for #119
Merge branch 'master' of https://github.com/pardom/ActiveAndroid