Merge pull request #80 from chicoree-/master

amoi77 StockSettings