0.9.6.1

better support for us