Resolved issue #16
Resolved issue #16