Merge pull request #1 from mianuddin/master