Too much changes to explain :(
Merge branch 'rework' of https://github.com/Ico91/Articles into rework