v1.0.7.1 patched and improved