Added --verbose argument to switch on logging of subgrid output
Merging master again