Issue 45

pullrequest