adding a way to manage or not the keyspace creation. fix #64
small merge