Danny Gonzalez
Range Chart/Ship fix
Merge origin/master