Merge pull request #72 from DrMarcII/master

Fix expect implementation.