Resolved issue #9
Resolved issue #11