Bug fixes and improvements/additions. (v0.2.4)