Functions improvements, bug fixes, tests added
Functions improvements, bug fixes, tests added