Minor refactoring
Merge branch 'dev' of https://github.com/mickael-menu/picc into dev
Minor refactoring