Issue 45

Resolved #45