v.1.0.4 - minor fixes and improvements