Little refactoring
Labels working correctly
Merge remote-tracking branch 'origin/master'