Updated to allow multiple completion criteria

fixes #33