Mr-Byte/pircolate 2 commits