Merge pull request #32 from hulu/master