Added support for the usage of i as well as j.