Resolved issue #5
Resolved issue #6