Fix merge error
Merge branch 'master' of github.com:alcexhim/AwesomeControls
Merge branch 'master' of github.com:alcexhim/AwesomeControls