Clean up Stock object
Merge remote-tracking branch 'origin/master'