changes
Merge branch 'master' of https://github.com/tonang/ShulTemplate-Option
changes