fix some stuffs

Signed-off-by: Lucas Tine-Beres <lucastineberes@gmail.com>
Merge remote-tracking branch 'github/master'