clayrat Merge pull request #32 from clayrat/master …