Merge pull request #226 from clayengine/master