Commited #47 modification