Syntax + Masterhandler for market
Merge pull request #193 from 5150Joker/dev

Syntax + Masterhandler for market