Performance

merge performance branch with master