Issue 37

Resolved #37