Multiple improvements
V 0.4.0