Several fixes and improvements for v1.1.0