Issue #151 Fixed several bugs, but still doesn't work....