Merge pull request #75 from eliagbayani/master

Follow-up work Data-1354