Issue 18

#18