Command line argument for adjusting size of the input grid. Also fixed merge error in last commit.