Resolved issue #149