Improved collission performance
Merge branch 'master'