Issue 36

Closed #36