Merge pull request #10 from eliagbayani/master

Data-1199 and other code maintenance.