Merge pull request #4 from zgolman/master

Merge with Master
Merge pull request #5 from zgolman/samantha

Merge pull request #4 from zgolman/master