Updated project.
Fix more leaky state
Merge remote-tracking branch 'upstream/master'