Merge pull request #2 from andrzej-kaczmarek/dev

Rename 'glue' to 'os'