Pull request/37cdbad8

Previous merge fails have created quite a bit of extra commits. This simply aims to push MarketData v0.1.2.