dryman Merge pull request #77 from dryman/OPIC-58