Updated dependencies
Solves issues #6, #8, #9