Updated Android Support Library.
Refactoring.
Refactoring #2.
Clean up.
Refactoring #3.
Merge pull request #30 from VEINHORN/master

Some improvements.