Issue 44

Resolved #44