Merge pull request #83 from MagisterXero/master

Fix't