Version 1.8 from main Project

Just for start