Final Changes
Merge CheckersDP/master