Merge pull request #19 from eliagbayani/master

Follow-up work DATA-1205.