modifications based on Tillerino's suggestions
https://github.com/Tillerino/Tillerinobot/issues/5#issuecomment-57489890

Signed-off-by: ThePooN <thepoon@cartooncraft.fr>