Addresses #20

#20