Small changes to Element and Input classes
Merge branch 'develop'

Conflicts:
	src/Element.php