Merge pull request #117 from artlogic/patch-1