Improvements and piriti upgrade
Merge with Master