Bug Fixed + added properties
Merge files