Fixing initial values
Fixed initial value bug
Merge branch 'fix_initial_values'