Merge pull request #71 from chicoree-/master

StockSettings & Settings