Input data control added.
Merge branch 'master' of https://github.com/MarketTeam/Market