Address OJ's comments
Merge pull request #2 from Meatballs1/pr3090

Address OJ's comments