Update based on bugs Dan found.
Merge pull request #3 from jordandukart/7.x

Update based on bugs Dan found.