Resolved issue 15