Merge pull request #12 from praccu/master

Updating
A few margins, but TagView and MainActivity don't yet have the proper
changes.
Merge pull request #26 from kostya-viktorov/master

Updating