#41

Adding the suggested in #41