Merge pull request #1 from shahff/master

Update from original