Merge pull request #41 from madarche/dependencies-update

Dependencies update
Merge remote-tracking branch 'upstream/master' into dependencies-update