Some methods
Added data types
Some parameters for the functions
Merge branch 'master' into generator