Fix memory issue and update to v1.1