Fixes issue #17
Merge pull request #18 from Polymer/fixissue17

Fixes issue #17