fixed several PACHS
Merge branch 'master' of https://github.com/shaybarak/ShkarimPlusPlus