M4 fixes. Future.immediate replaced with Future.value. Tests passing
Merge pull request #20 from donny-dont/master

M4 fixes