Refactoring and new functions
Added makeElementTree
Resolved conflicts