Remove unnecessary underscore
Change Future.apply to Future.successful
Merge remote-tracking branch 'origin/master'