merges development branch. Fixes merge bugs