Better way to do that (#102)

Sorry for all the small commits :(