Merge pull request #26 from hariadi/master

Updating dependencies
Merge remote-tracking branch 'upstream/master'