Added control and shift-keyboard combination with mouse click.
Fix for incomplete code.
Merge branch 'feature/grid_improvements'