Resolved issue 16