Merge pull request #22 from eliagbayani/master

DATA-1196 Follow-up work.