fixed github issues 15 and 16
fixed github issues 15 and 16