Merged commits2

merged commits into a branch