first stab at #489
Merge pull request #519 from RactiveJS/gh-489

first stab at #489