Merge pull request #30 from aenario/master

Make tests resilient
1.0.0
Merge pull request #31 from frankrousseau/master

1.0.0