Commit Simon's changes for Issue 134