Merged Dev and Master branch