updated description
Merge pull request #58 from idleberg/2.0-dev

updated description