Update Master

Version 3, Edit type of accepting parameters