Minor Fixes
Merge pull request #85 from Nurhashimah/master

Minor Fixes