Issue 6

Should fix #6 :dancer: