Code beautification
Add version information to some new functions
Version bump to 2.1.0