merge latest changes from MorganAJ master