First commit
fixed merge conflicts on master