Fixes component/component.io#61
Merge pull request #62 from nmussy/master

Fixes component/component.io#61