Issue 7

should fix #7