Minor changes to ease android development.
Removing unnecessary generalization.
trying to add commit
Merge remote-tracking branch 'origin/master'