add support of custom controls
Merge pull request #114 from Hyzhak/master

add support of custom controls