Merge with base compat (1)
Merge branch 'master' of github.com:jcristovao/BaseFuture
Fixed imports