Merge https://github.com/sgsabbage/pavara
Merge https://github.com/assertivist/pavara