consolidated changes
Merge pull request #18 from RickSaling/futures2

consolidated changes