Bug fixes and update to Version 1.0.0.2