Develop to Master

FIRST STABLE VERSION