Merge pull request #17 from pkruithof/master

Improved redundancy issue