Fixed bugs
Merge branch 'master' of github.com:ichyr/cathedral