convert the init method to use consistent types
Merge branch 'master' into convertToConsistentTypes
Merge branch 'convertToConsistentTypes'