Resolved issue #11