Updates on form elements
Merge branch 'develop' of https://github.com/elieish/yard into develop