Merge pull request #1 from OdonataResearchLLC/master