Some fuck with deletions
Some refactiring
Merge remote-tracking branch 'upstream/master' into info
Merge pull request #36 from the12chairs/info

Last steps