Performance

merge performance branch with master
Missing space after #.