Performance updated, changed if else to switch case
Merged master
Removed whitespace