Updated v2.1.1 with latest changes.