Merge pull request #367 from meisteg/fix_every_other