updated dependencies, fixed issues #21, #18, #17, #16, #15