C18 stuff
Merge pull request #3 from lajosm/develop

C18 stuff