Merge pull request #617 from flatfly/patch-3