Updates to Board & Move
Merge remote-tracking branch 'origin/master'