Fixed bugs mentioned in issues #19 #20 and #21. Attempting to include xml files now