simplify usage of future
Merge remote-tracking branch 'upstream/master'
Merge pull request #28 from sethladd/master

simplify usage of future