edit problems with cases
Merge origin/master