Fixed #55, updated dependencies
Fixed #54, updated dependencies and adjusted keywords