Fixed errors
Merge branch 'master' into strings