mbj Merge pull request #23 from mbj/fix/redundancy …