Merge pull request #1 from felgenh3/master

Still the market