Merge pull request #618 from ebraminio/master

Avoid GWT depedency by bringing simplified dir estimate logic
fix import
remove unused variable
various dependency upgrades