Updated Simplex

Fixes issue #5