Merge pull request #26 from himedlooff/master

Adds support for cf-core and updates OS info.