Issue 72

#72