Merge branch 'AddPoints'