Issue #10 - remove some panic(err) and use fmt.Errorf instead