Minor fixes
Merge pull request #88 from Nurhashimah/master

Minor fixes