Merge pull request #1 from benbalter