Previous commit had an old, modified copy from npm. Updated copy to the latest commit and made changes to include or/and functionality.