Merge pull request #22 from thewillhuang/hiroshi

Fix another "empty object is truthy" bug.