Brunch 1.7

Closes #113