Remove deprecated 'contains' function
Improve 'simplify' function
Merge pull request #21 from magistere/contains

Remove deprecated 'contains' function
Merge pull request #22 from magistere/simplify

Improve 'simplify' function