Issue 7

#7