Merged #57

Merged #57.