Merge pull request #1 from KarlKode/master

Test
Update
Merge pull request #3 from ynh/master

Last updates