Merge pull request #18 from noxsicarius/NoxSicarius