Update Master

Version 2, correcting mistakes