Updating according to https://github.com/ldleman/Leed-market/issues/79
Merge