Merge pull request #21 from ellerh/fix-+loop