initial values should be set in the right place!
merged branch 'master'