Merge pull request #119 from oxylusengine/components