Resolves Issues #1