dry
Merge pull request #77 from idleberg/2.0-dev

dry