Merge pull request #80 from Nauxuron/master