Master commit #

Made changes