Merge pull request #1 from azrul/master

Updates