Merge pull request #1 from opensolutions/master

merge