Fixed bug in binary search
Merge branch 'master' into performance-profile