merge development branch, update to v1.1