tursilion Merge pull request #23 from polluks/main