Added properties to Element class
element.py conflict solved