Rebound rage.

Now compatible with latest commits.
Closes #97