Created library to update and check canonical forms
Merge remote-tracking branch 'upstream3/master'