v1.0.5 + several fixes