Merge pull request #52 from mayurjadhav/RG-104

RG-104 modified code for revious year grant program id
RG-116 -- Fixed changed option values
RG-116 -- Fixed changed option values
Merge pull request #53 from Edzelopez/RG-116

RG-116 -- Fixed changed option values