fix stock data
Merge branch 'develop' into us