Merge pull request #1 from ilovb/master

Update from original