Complete merge

Merged both branches, will use only Master from now on