Merge pull request #18 from metrix-ai/master