Merge pull request #3 from luqmana/master