Issue 34

Resolved #34