Merge pull request #1 from caskroom/master

Merge From Original