Rebase on master
Structured score
Adjusted formatting
Merged with Visual Studio optimized bug fix