Primer commit
Merge https://github.com/deamongraph/android