add better support for locals
release 0.1.6