Issue 26

#26