Some improvements #35
Enhancement