Merge pull request #246 from alicelieutier/master

added an option "circular"