Merged changes from rorosaurus/sudoku via merge request #2