Updated to allow multiple completion criteria

fixes #33
Removed event listener
Merge pull request #36 from adaptlearning/issue/#33

Issue/#33