Some improvements

Please dump version npm if you merge