Updates to old methods, and added new methods.
Merge branch 'master' into development
Made some methods static.