Resolved issue #22
Resolved issue #22