Add maker checker support
Merge pull request #622 from lingalamadhukar/bugfixes

Add maker checker support