merged latest library branch

Merge commit '99f87872a9294420803717ce8fa5874992657464' into testWorkingBranch

Conflicts:
	library/Class1.cs