fix issue 326 ("flags --column and --context together produce an error") with test
Merge pull request #396 from bartlomiejb/dev

Fix issue #326 ("flags --column and --context together produce an error")