Closes #62 and possibly #47

Closes #62 and possibly #47.
Conflicts with #63.

[example pen](http://codepen.io/thgreasi/pen/EbDLr)