minor fixed and improvements
updated dependencies
Merge pull request #75 from idleberg/2.0-dev

minor fixed and improvements