task #2
Merge https://github.com/ichyr/cathedral