implemented Apurv's change to master close #12