Merge pull request #1 from AncientLysine/master

Merge
Debug
Merge pull request #3 from AncientAnton/master

_(:3 L)_