Issue 14

Should fix #14