1.2.1

Bug fixes and improvements.