Issue 31

Closed #31