Refreshing

Cherrypicked to close #34.