Fixes #29 improves