diff --git a/LazZiya.ImageResize/Animated/AnimatedGif.cs b/LazZiya.ImageResize/Animated/AnimatedImage.cs
similarity index 71%
rename from LazZiya.ImageResize/Animated/AnimatedGif.cs
rename to LazZiya.ImageResize/Animated/AnimatedImage.cs
index 3e0f2d9..f4ece4b 100644
--- a/LazZiya.ImageResize/Animated/AnimatedGif.cs
+++ b/LazZiya.ImageResize/Animated/AnimatedImage.cs
@@ -9,9 +9,9 @@
 namespace LazZiya.ImageResize.Animated
 {
     /// <summary>
-    /// Represents an animated gif image with multiple frames
+    /// Represents an animated image image with multiple frames
     /// </summary>
-    public class AnimatedGif : IDisposable
+    public class AnimatedImage : IDisposable
     {
         /// <summary>
         /// Gif image as list of frames
@@ -59,72 +59,86 @@ public class AnimatedGif : IDisposable
         public ImageFormat RawFormat { get; }
 
         /// <summary>
-        /// Create an animated gif from file
+        /// private constructor
         /// </summary>
-        /// <param name="filePath"></param>
-        public AnimatedGif(string filePath)
-            : this(Image.FromFile(filePath))
+        private AnimatedImage(Image image)
         {
-            
+            if (!ImageAnimator.CanAnimate(image))
+                throw new BadImageFormatException("This is not an animated gif!");
+
+            var dim = new FrameDimension(image.FrameDimensionsList[0]);
+            FramesCount = image.GetFrameCount(dim);
+            Size = new Size(image.Width, image.Height);
+            Frames = new List<Image>();
+            ImageColorFormat = ImageColorFormats.GetColorFormat((Bitmap)image);
+            PixelFormat = image.PixelFormat;
+            HorizontalResolution = image.HorizontalResolution;
+            VerticalResolution = image.VerticalResolution;
+            RawFormat = image.RawFormat;
+
+            for (int i = 0; i < FramesCount; i++)
+            {
+                image.SelectActiveFrame(dim, i);
+                var frame = image.Clone() as Image;
+                Frames.Add(frame);
+            }
+
+            image.Dispose();
         }
 
         /// <summary>
-        /// Create an animated gif from a stream
+        /// Create animated image from file
         /// </summary>
-        /// <param name="stream"></param>
-        public AnimatedGif(Stream stream)
-            :this(Image.FromStream(stream))
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        public static AnimatedImage FromFile(string fileName)
         {
-
+            var img = Image.FromFile(fileName);
+            return new AnimatedImage(img);
         }
 
         /// <summary>
-        /// Create an animated gif from HBitmap
+        /// Create animated image from stream
         /// </summary>
-        /// <param name="hbitmap"></param>
-        public AnimatedGif(IntPtr hbitmap)
-            : this(Image.FromHbitmap(hbitmap))
+        /// <param name="stream"></param>
+        /// <returns></returns>
+        public static AnimatedImage FromStream(Stream stream)
         {
+            var img = Image.FromStream(stream);
+            return new AnimatedImage(img);
+        }
 
+        /// <summary>
+        /// Create animated image from image
+        /// </summary>
+        /// <param name="image"></param>
+        /// <returns></returns>
+        public static AnimatedImage FromImage(Image image)
+        {
+            return new AnimatedImage(image);
         }
 
         /// <summary>
-        /// Create an animated gif from HBitmap
+        /// Create animated image from bitmap
         /// </summary>
         /// <param name="hbitmap"></param>
-        /// <param name="hplatte"></param>
-        public AnimatedGif(IntPtr hbitmap, IntPtr hplatte)
-            : this(Image.FromHbitmap(hbitmap, hplatte))
+        /// <returns></returns>
+        public static AnimatedImage FromHBitmap(IntPtr hbitmap)
         {
-
+            var img = Image.FromHbitmap(hbitmap);
+            return new AnimatedImage(img);
         }
 
         /// <summary>
-        /// Create animated gif from Image file
+        /// Create animated image from bitmap
         /// </summary>
-        /// <param name="image"></param>
-        public AnimatedGif(Image image)
+        /// <param name="hbitmap"></param>
+        /// <param name="hpalatte"></param>
+        /// <returns></returns>
+        public static AnimatedImage FromHBitmap(IntPtr hbitmap, IntPtr hpalatte)
         {
-            if (!ImageAnimator.CanAnimate(image))
-                throw new BadImageFormatException("This is not an animated gif!");
-
-            var dim = new FrameDimension(image.FrameDimensionsList[0]);
-            FramesCount = image.GetFrameCount(dim);
-            Size = new Size(image.Width, image.Height);
-            Frames = new List<Image>();
-
-            ImageColorFormat = ImageColorFormats.GetColorFormat((Bitmap)image);
-            PixelFormat = image.PixelFormat;
-            HorizontalResolution = image.HorizontalResolution;
-            VerticalResolution = image.VerticalResolution;
-            RawFormat = image.RawFormat;
-
-            for (int i = 0; i < FramesCount; i++)
-            {
-                image.SelectActiveFrame(dim, i);
-                var frame = image.Clone() as Image;
-                Frames.Add(frame);
-            }
+            var img = Image.FromHbitmap(hbitmap, hpalatte);
+            return new AnimatedImage(img);
         }
 
         /// <summary>
@@ -157,7 +171,7 @@ public void Dispose()
         /// <summary>
         /// deconstruct
         /// </summary>
-        ~AnimatedGif()
+        ~AnimatedImage()
         {
             this.Dispose();
         }
diff --git a/LazZiya.ImageResize/Animated/AnimatedGifWaterMark.cs b/LazZiya.ImageResize/Animated/AnimatedImageImageWatermark.cs
similarity index 82%
rename from LazZiya.ImageResize/Animated/AnimatedGifWaterMark.cs
rename to LazZiya.ImageResize/Animated/AnimatedImageImageWatermark.cs
index 3fbe6ac..3a269d0 100644
--- a/LazZiya.ImageResize/Animated/AnimatedGifWaterMark.cs
+++ b/LazZiya.ImageResize/Animated/AnimatedImageImageWatermark.cs
@@ -6,14 +6,14 @@ namespace LazZiya.ImageResize.Animated
     /// <summary>
     /// Add an image watermark to animated gif
     /// </summary>
-    public static class AnimatedGifWaterMark
+    public static class AnimatedImageImageWatermark
     {
         /// <summary>
         /// Draw image watermark
         /// </summary>
         /// <param name="img">The original image</param>
         /// <param name="wmImgPath">Path to the watermark image file e.g. wwwroot\images\watermark.png</param>
-        public static AnimatedGif AddImageWatermark(this AnimatedGif img, string wmImgPath)
+        public static AnimatedImage AddImageWatermark(this AnimatedImage img, string wmImgPath)
         {
             var wm = Image.FromFile(wmImgPath);
             return img.AddImageWatermark(wm, new ImageWatermarkOptions());
@@ -24,7 +24,7 @@ public static AnimatedGif AddImageWatermark(this AnimatedGif img, string wmImgPa
         /// </summary>
         /// <param name="img">The original image</param>
         /// <param name="wmImage">Watermark image</param>
-        public static AnimatedGif AddImageWatermark(this AnimatedGif img, Image wmImage)
+        public static AnimatedImage AddImageWatermark(this AnimatedImage img, Image wmImage)
         {
             return img.AddImageWatermark(wmImage, new ImageWatermarkOptions());
         }
@@ -35,7 +35,7 @@ public static AnimatedGif AddImageWatermark(this AnimatedGif img, Image wmImage)
         /// <param name="img">The original image</param>
         /// <param name="wmImgPath">Path to the watermark image file e.g. wwwroot\images\watermark.png</param>
         /// <param name="ops">Image watermark options <see cref="ImageWatermarkOptions"/></param>
-        public static AnimatedGif AddImageWatermark(this AnimatedGif img, string wmImgPath, ImageWatermarkOptions ops)
+        public static AnimatedImage AddImageWatermark(this AnimatedImage img, string wmImgPath, ImageWatermarkOptions ops)
         {
             var wm = Image.FromFile(wmImgPath);
             return img.AddImageWatermark(wm, ops);
@@ -50,7 +50,7 @@ public static AnimatedGif AddImageWatermark(this AnimatedGif img, string wmImgPa
         /// <param name="img">The original image</param>
         /// <param name="wmImage">Watermak image</param>
         /// <param name="ops">Image watermark options <see cref="ImageWatermarkOptions"/></param>
-        public static AnimatedGif AddImageWatermark(this AnimatedGif img, Image wmImage, ImageWatermarkOptions ops)
+        public static AnimatedImage AddImageWatermark(this AnimatedImage img, Image wmImage, ImageWatermarkOptions ops)
         {
             var fList = new List<Image>();
 
diff --git a/LazZiya.ImageResize/Animated/AnimatedGifResize.cs b/LazZiya.ImageResize/Animated/AnimatedImageResize.cs
similarity index 86%
rename from LazZiya.ImageResize/Animated/AnimatedGifResize.cs
rename to LazZiya.ImageResize/Animated/AnimatedImageResize.cs
index 537eb6a..b9cc84f 100644
--- a/LazZiya.ImageResize/Animated/AnimatedGifResize.cs
+++ b/LazZiya.ImageResize/Animated/AnimatedImageResize.cs
@@ -1,7 +1,5 @@
 using LazZiya.ImageResize.ColorFormats;
 using LazZiya.ImageResize.ResizeMethods;
-using LazZiya.ImageResize.Tools;
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -12,7 +10,7 @@ namespace LazZiya.ImageResize.Animated
     /// <summary>
     /// Resize images
     /// </summary>
-    public static class AnimatedGifResize
+    public static class AnimatedImageResize
     {
         /// <summary>
         /// Auto scale image by width or height till longest border (width/height) is equal to new width/height.
@@ -24,7 +22,7 @@ public static class AnimatedGifResize
         /// <param name="newWidth"></param>
         /// <param name="newHeight"></param>
         /// <returns></returns>
-        public static AnimatedGif Scale(this AnimatedGif img, int newWidth, int newHeight)
+        public static AnimatedImage Scale(this AnimatedImage img, int newWidth, int newHeight)
         {
             var resize = new Scale(img.Size, new Size(newWidth, newHeight));
 
@@ -42,7 +40,7 @@ public static AnimatedGif Scale(this AnimatedGif img, int newWidth, int newHeigh
         /// <param name="newHeight"></param>
         /// <param name="ops">Graphic options <see cref="GraphicOptions"/></param>
         /// <returns></returns>
-        public static AnimatedGif Scale(this AnimatedGif img, int newWidth, int newHeight, GraphicOptions ops)
+        public static AnimatedImage Scale(this AnimatedImage img, int newWidth, int newHeight, GraphicOptions ops)
         {
             var resize = new Scale(img.Size, new Size(newWidth, newHeight));
 
@@ -56,7 +54,7 @@ public static AnimatedGif Scale(this AnimatedGif img, int newWidth, int newHeigh
         /// <param name="img"></param>
         /// <param name="newWidth"></param>
         /// <returns></returns>
-        public static AnimatedGif ScaleByWidth(this AnimatedGif img, int newWidth)
+        public static AnimatedImage ScaleByWidth(this AnimatedImage img, int newWidth)
         {
             var resize = new Scale(img.Size, new Size(newWidth, 0));
 
@@ -71,7 +69,7 @@ public static AnimatedGif ScaleByWidth(this AnimatedGif img, int newWidth)
         /// <param name="newWidth"></param>
         /// <param name="ops">Graphic options <see cref="GraphicOptions"/></param>
         /// <returns></returns>
-        public static AnimatedGif GifScaleByWidth(this AnimatedGif img, int newWidth, GraphicOptions ops)
+        public static AnimatedImage GifScaleByWidth(this AnimatedImage img, int newWidth, GraphicOptions ops)
         {
             var resize = new Scale(img.Size, new Size(newWidth, 0));
 
@@ -85,7 +83,7 @@ public static AnimatedGif GifScaleByWidth(this AnimatedGif img, int newWidth, Gr
         /// <param name="img"></param>
         /// <param name="newHeight"></param>
         /// <returns></returns>
-        public static AnimatedGif ScaleByHeight(this AnimatedGif img, int newHeight)
+        public static AnimatedImage ScaleByHeight(this AnimatedImage img, int newHeight)
         {
             var resize = new Scale(img.Size, new Size(0, newHeight));
 
@@ -100,7 +98,7 @@ public static AnimatedGif ScaleByHeight(this AnimatedGif img, int newHeight)
         /// <param name="newHeight"></param>
         /// <param name="ops">Graphic options <see cref="GraphicOptions"/></param>
         /// <returns></returns>
-        public static AnimatedGif ScaleByHeight(this AnimatedGif img, int newHeight, GraphicOptions ops)
+        public static AnimatedImage ScaleByHeight(this AnimatedImage img, int newHeight, GraphicOptions ops)
         {
             var resize = new Scale(img.Size, new Size(0, newHeight));
 
@@ -117,7 +115,7 @@ public static AnimatedGif ScaleByHeight(this AnimatedGif img, int newHeight, Gra
         /// <param name="newHeight"></param>
         /// <param name="spot"></param>
         /// <returns></returns>
-        public static AnimatedGif ScaleAndCrop(this AnimatedGif img, int newWidth, int newHeight, TargetSpot spot = TargetSpot.Center)
+        public static AnimatedImage ScaleAndCrop(this AnimatedImage img, int newWidth, int newHeight, TargetSpot spot = TargetSpot.Center)
         {
             var resize = new ScaleAndCrop(img.Size, new Size(newWidth, newHeight), spot);
 
@@ -135,7 +133,7 @@ public static AnimatedGif ScaleAndCrop(this AnimatedGif img, int newWidth, int n
         /// <param name="spot"></param>
         /// <param name="ops">Graphic options <see cref="GraphicOptions"/></param>
         /// <returns></returns>
-        public static AnimatedGif ScaleAndCrop(this AnimatedGif img, int newWidth, int newHeight, GraphicOptions ops, TargetSpot spot = TargetSpot.Center)
+        public static AnimatedImage ScaleAndCrop(this AnimatedImage img, int newWidth, int newHeight, GraphicOptions ops, TargetSpot spot = TargetSpot.Center)
         {
             var resize = new ScaleAndCrop(img.Size, new Size(newWidth, newHeight), spot);
 
@@ -151,7 +149,7 @@ public static AnimatedGif ScaleAndCrop(this AnimatedGif img, int newWidth, int n
         /// <param name="newHeight"></param>
         /// <param name="spot">target spot to crop and save</param>
         /// <returns></returns>
-        public static AnimatedGif Crop(this AnimatedGif img, int newWidth, int newHeight, TargetSpot spot = TargetSpot.Center)
+        public static AnimatedImage Crop(this AnimatedImage img, int newWidth, int newHeight, TargetSpot spot = TargetSpot.Center)
         {
             var resize = new Crop(img.Size, new Size(newWidth, newHeight), spot);
             return Resize(img, resize.SourceRect, resize.TargetRect);
@@ -167,7 +165,7 @@ public static AnimatedGif Crop(this AnimatedGif img, int newWidth, int newHeight
         /// <param name="spot">target spot to crop and save</param>
         /// <param name="ops">Graphic options <see cref="GraphicOptions"/></param>
         /// <returns></returns>
-        public static AnimatedGif Crop(this AnimatedGif img, int newWidth, int newHeight, GraphicOptions ops, TargetSpot spot = TargetSpot.Center)
+        public static AnimatedImage Crop(this AnimatedImage img, int newWidth, int newHeight, GraphicOptions ops, TargetSpot spot = TargetSpot.Center)
         {
             var resize = new Crop(img.Size, new Size(newWidth, newHeight), spot);
             return Resize(img, resize.SourceRect, resize.TargetRect, ops);
@@ -181,7 +179,7 @@ public static AnimatedGif Crop(this AnimatedGif img, int newWidth, int newHeight
         /// can be the whole image or part of it</param>
         /// <param name="target">The coordinates of the target image size</param>
         /// <returns></returns>
-        public static AnimatedGif Resize(this AnimatedGif img, Rectangle source, Rectangle target)
+        public static AnimatedImage Resize(this AnimatedImage img, Rectangle source, Rectangle target)
         {
             return img.Resize(source, target, new GraphicOptions());
         }
@@ -195,7 +193,7 @@ public static AnimatedGif Resize(this AnimatedGif img, Rectangle source, Rectang
         /// <param name="target">The coordinates of the target image size</param>
         /// <param name="ops">Graphic options <see cref="GraphicOptions"/></param>
         /// <returns></returns>
-        public static AnimatedGif Resize(this AnimatedGif img, Rectangle source, Rectangle target, GraphicOptions ops)
+        public static AnimatedImage Resize(this AnimatedImage img, Rectangle source, Rectangle target, GraphicOptions ops)
         {
             // check for CMYK pixel format to use Format32bppArgb
             // or use the image pixel format
diff --git a/LazZiya.ImageResize/Animated/AnimatedTextWatermark.cs b/LazZiya.ImageResize/Animated/AnimatedImageTextWatermark.cs
similarity index 80%
rename from LazZiya.ImageResize/Animated/AnimatedTextWatermark.cs
rename to LazZiya.ImageResize/Animated/AnimatedImageTextWatermark.cs
index d0720cc..3f2735d 100644
--- a/LazZiya.ImageResize/Animated/AnimatedTextWatermark.cs
+++ b/LazZiya.ImageResize/Animated/AnimatedImageTextWatermark.cs
@@ -7,7 +7,7 @@ namespace LazZiya.ImageResize
     /// <summary>
     /// Add text watermark over the image.
     /// </summary>
-    public static class AnimatedTextWatermark
+    public static class AnimatedImageTextWatermark
     {
 
         /// <summary>
@@ -15,7 +15,7 @@ public static class AnimatedTextWatermark
         /// </summary>
         /// <param name="img"></param>
         /// <param name="text"></param>
-        public static AnimatedGif AddTextWatermark(this AnimatedGif img, string text)
+        public static AnimatedImage AddTextWatermark(this AnimatedImage img, string text)
         {
             return AddTextWatermark(img, text, new TextWatermarkOptions());
         }
@@ -26,7 +26,7 @@ public static AnimatedGif AddTextWatermark(this AnimatedGif img, string text)
         /// <param name="img"></param>
         /// <param name="text">text to draw over the image</param>
         /// <param name="ops">Text watermark options <see cref="TextWatermarkOptions"/></param>
-        public static AnimatedGif AddTextWatermark(this AnimatedGif img, string text, TextWatermarkOptions ops)
+        public static AnimatedImage AddTextWatermark(this AnimatedImage img, string text, TextWatermarkOptions ops)
         {
             var fList = new List<Image>();
 
diff --git a/LazZiya.ImageResize/LazZiya.ImageResize.csproj b/LazZiya.ImageResize/LazZiya.ImageResize.csproj
index 2c98e42..160039c 100644
--- a/LazZiya.ImageResize/LazZiya.ImageResize.csproj
+++ b/LazZiya.ImageResize/LazZiya.ImageResize.csproj
@@ -10,11 +10,12 @@
     <PackageTags>asp.net,core,.net,dotnet,image,resize,text,overlay</PackageTags>
     <RepositoryUrl>https://github.com/LazZiya/ImageResize</RepositoryUrl>
     <PackageProjectUrl>http://demo.ziyad.info/en/ImageResize</PackageProjectUrl>
-    <VersionPrefix>3.1.0</VersionPrefix>
-    <VersionSuffix>beta1</VersionSuffix>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
+    <VersionPrefix>4.0.0</VersionPrefix>
+    <VersionSuffix>preview1</VersionSuffix>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <FileVersion>4.0.0.0</FileVersion>
     <PackageReleaseNotes>
+      - Added support for animated gif (resize, text watewrmark, image water
       - Update ref for System.Drawing.Common https://github.com/dotnet/core/issues/3244
       - See all release notes https://github.com/LazZiya/ImageResize/releases
     </PackageReleaseNotes>
diff --git a/LazZiya.ImageResize/files/LazZiya.ImageResize.xml b/LazZiya.ImageResize/files/LazZiya.ImageResize.xml
index bc942da..3705605 100644
--- a/LazZiya.ImageResize/files/LazZiya.ImageResize.xml
+++ b/LazZiya.ImageResize/files/LazZiya.ImageResize.xml
@@ -4,110 +4,158 @@
         <name>LazZiya.ImageResize</name>
     </assembly>
     <members>
-        <member name="T:LazZiya.ImageResize.Animated.AnimatedGif">
+        <member name="T:LazZiya.ImageResize.Animated.AnimatedImage">
             <summary>
-            Represents an animated gif image with multiple frames
+            Represents an animated image image with multiple frames
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.Frames">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.Frames">
             <summary>
             Gif image as list of frames
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.RepeatCount">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.RepeatCount">
             <summary>
             Set repeat count. (-1) no repeat. (0) always repeat
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.FramesCount">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.FramesCount">
             <summary>
             Get frames count in an animated gif
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.Size">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.Size">
             <summary>
             Get width and height of the image
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.ImageColorFormat">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.ImageColorFormat">
             <summary>
             Get image color format
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.PixelFormat">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.PixelFormat">
             <summary>
             Get pixel format
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.HorizontalResolution">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.HorizontalResolution">
             <summary>
             Get horizontal resolution
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.VerticalResolution">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.VerticalResolution">
             <summary>
             Get vertival resolution
             </summary>
         </member>
-        <member name="P:LazZiya.ImageResize.Animated.AnimatedGif.RawFormat">
+        <member name="P:LazZiya.ImageResize.Animated.AnimatedImage.RawFormat">
             <summary>
             Get image raw format
             </summary>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.#ctor(System.String)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.#ctor(System.Drawing.Image)">
             <summary>
-            Create an animated gif from file
+            private constructor
             </summary>
-            <param name="filePath"></param>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.#ctor(System.IO.Stream)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.FromFile(System.String)">
             <summary>
-            Create an animated gif from a stream
+            Create animated image from file
+            </summary>
+            <param name="fileName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.FromStream(System.IO.Stream)">
+            <summary>
+            Create animated image from stream
             </summary>
             <param name="stream"></param>
+            <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.#ctor(System.IntPtr)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.FromImage(System.Drawing.Image)">
             <summary>
-            Create an animated gif from HBitmap
+            Create animated image from image
             </summary>
-            <param name="hbitmap"></param>
+            <param name="image"></param>
+            <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.#ctor(System.IntPtr,System.IntPtr)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.FromHBitmap(System.IntPtr)">
             <summary>
-            Create an animated gif from HBitmap
+            Create animated image from bitmap
             </summary>
             <param name="hbitmap"></param>
-            <param name="hplatte"></param>
+            <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.#ctor(System.Drawing.Image)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.FromHBitmap(System.IntPtr,System.IntPtr)">
             <summary>
-            Create animated gif from Image file
+            Create animated image from bitmap
             </summary>
-            <param name="image"></param>
+            <param name="hbitmap"></param>
+            <param name="hpalatte"></param>
+            <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.SaveAs(System.String,System.Int32)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.SaveAs(System.String,System.Int32)">
             <summary>
             Save animated gif
             </summary>
             <param name="path"></param>
             <param name="delay">Frmae delay in milliseconds</param>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.Dispose">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.Dispose">
             <summary>
             Clear frames
             </summary>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGif.Finalize">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImage.Finalize">
             <summary>
             deconstruct
             </summary>
         </member>
-        <member name="T:LazZiya.ImageResize.Animated.AnimatedGifResize">
+        <member name="T:LazZiya.ImageResize.Animated.AnimatedImageImageWatermark">
+            <summary>
+            Add an image watermark to animated gif
+            </summary>
+        </member>
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageImageWatermark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedImage,System.String)">
+            <summary>
+            Draw image watermark
+            </summary>
+            <param name="img">The original image</param>
+            <param name="wmImgPath">Path to the watermark image file e.g. wwwroot\images\watermark.png</param>
+        </member>
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageImageWatermark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedImage,System.Drawing.Image)">
+            <summary>
+            Draw image watermark
+            </summary>
+            <param name="img">The original image</param>
+            <param name="wmImage">Watermark image</param>
+        </member>
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageImageWatermark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedImage,System.String,LazZiya.ImageResize.ImageWatermarkOptions)">
+            <summary>
+            Draw image watermark
+            </summary>
+            <param name="img">The original image</param>
+            <param name="wmImgPath">Path to the watermark image file e.g. wwwroot\images\watermark.png</param>
+            <param name="ops">Image watermark options <see cref="T:LazZiya.ImageResize.ImageWatermarkOptions"/></param>
+        </member>
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageImageWatermark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedImage,System.Drawing.Image,LazZiya.ImageResize.ImageWatermarkOptions)">
+            <summary>
+            Draw image watermark.
+            <para>Notice regarding watermark opacity:</para>
+            <para>If watermark image needs to be resized, first resize the watermark image, 
+            then save it to the disc, and read it again with Image.FromFile.</para>
+            </summary>
+            <param name="img">The original image</param>
+            <param name="wmImage">Watermak image</param>
+            <param name="ops">Image watermark options <see cref="T:LazZiya.ImageResize.ImageWatermarkOptions"/></param>
+        </member>
+        <member name="T:LazZiya.ImageResize.Animated.AnimatedImageResize">
             <summary>
             Resize images
             </summary>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.Scale(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,System.Int32)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.Scale(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,System.Int32)">
             <summary>
             Auto scale image by width or height till longest border (width/height) is equal to new width/height.
             Final image aspect ratio is equal to original image aspect ratio.
@@ -119,7 +167,7 @@
             <param name="newHeight"></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.Scale(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,System.Int32,LazZiya.ImageResize.GraphicOptions)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.Scale(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,System.Int32,LazZiya.ImageResize.GraphicOptions)">
             <summary>
             Auto scale image by width or height till longest border (width/height) is equal to new width/height.
             Final image aspect ratio is equal to original image aspect ratio.
@@ -132,7 +180,7 @@
             <param name="ops">Graphic options <see cref="T:LazZiya.ImageResize.GraphicOptions"/></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.ScaleByWidth(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.ScaleByWidth(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32)">
             <summary>
             Scale image by width and keep same aspect ratio of target image same as the original image.
             Height will be adjusted automatically
@@ -141,7 +189,7 @@
             <param name="newWidth"></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.GifScaleByWidth(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,LazZiya.ImageResize.GraphicOptions)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.GifScaleByWidth(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,LazZiya.ImageResize.GraphicOptions)">
             <summary>
             Scale image by width and keep same aspect ratio of target image same as the original image.
             Height will be adjusted automatically
@@ -151,7 +199,7 @@
             <param name="ops">Graphic options <see cref="T:LazZiya.ImageResize.GraphicOptions"/></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.ScaleByHeight(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.ScaleByHeight(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32)">
             <summary>
             Scale image by height and keep same aspect ratio of target image same as the original image.
             Width will be adjusted automatically
@@ -160,7 +208,7 @@
             <param name="newHeight"></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.ScaleByHeight(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,LazZiya.ImageResize.GraphicOptions)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.ScaleByHeight(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,LazZiya.ImageResize.GraphicOptions)">
             <summary>
             Scale image by height and keep same aspect ratio of target image same as the original image.
             Width will be adjusted automatically
@@ -170,7 +218,7 @@
             <param name="ops">Graphic options <see cref="T:LazZiya.ImageResize.GraphicOptions"/></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.ScaleAndCrop(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,System.Int32,LazZiya.ImageResize.TargetSpot)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.ScaleAndCrop(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,System.Int32,LazZiya.ImageResize.TargetSpot)">
             <summary>
             Scale target image till shortest border are equal to target value, 
             then crop the additonal pixels from the longest border.
@@ -182,7 +230,7 @@
             <param name="spot"></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.ScaleAndCrop(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,System.Int32,LazZiya.ImageResize.GraphicOptions,LazZiya.ImageResize.TargetSpot)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.ScaleAndCrop(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,System.Int32,LazZiya.ImageResize.GraphicOptions,LazZiya.ImageResize.TargetSpot)">
             <summary>
             Scale target image till shortest border are equal to target value, 
             then crop the additonal pixels from the longest border.
@@ -195,7 +243,7 @@
             <param name="ops">Graphic options <see cref="T:LazZiya.ImageResize.GraphicOptions"/></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.Crop(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,System.Int32,LazZiya.ImageResize.TargetSpot)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.Crop(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,System.Int32,LazZiya.ImageResize.TargetSpot)">
             <summary>
             Directly crop original image without scaling it.
             Final image aspect ratio is equal to given new width/height
@@ -206,7 +254,7 @@
             <param name="spot">target spot to crop and save</param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.Crop(LazZiya.ImageResize.Animated.AnimatedGif,System.Int32,System.Int32,LazZiya.ImageResize.GraphicOptions,LazZiya.ImageResize.TargetSpot)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.Crop(LazZiya.ImageResize.Animated.AnimatedImage,System.Int32,System.Int32,LazZiya.ImageResize.GraphicOptions,LazZiya.ImageResize.TargetSpot)">
             <summary>
             Directly crop original image without scaling it.
             Final image aspect ratio is equal to given new width/height
@@ -218,7 +266,7 @@
             <param name="ops">Graphic options <see cref="T:LazZiya.ImageResize.GraphicOptions"/></param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.Resize(LazZiya.ImageResize.Animated.AnimatedGif,System.Drawing.Rectangle,System.Drawing.Rectangle)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.Resize(LazZiya.ImageResize.Animated.AnimatedImage,System.Drawing.Rectangle,System.Drawing.Rectangle)">
             <summary>
             Specify custom resize options
             </summary>
@@ -228,7 +276,7 @@
             <param name="target">The coordinates of the target image size</param>
             <returns></returns>
         </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifResize.Resize(LazZiya.ImageResize.Animated.AnimatedGif,System.Drawing.Rectangle,System.Drawing.Rectangle,LazZiya.ImageResize.GraphicOptions)">
+        <member name="M:LazZiya.ImageResize.Animated.AnimatedImageResize.Resize(LazZiya.ImageResize.Animated.AnimatedImage,System.Drawing.Rectangle,System.Drawing.Rectangle,LazZiya.ImageResize.GraphicOptions)">
             <summary>
             Specify custom resize options
             </summary>
@@ -239,44 +287,6 @@
             <param name="ops">Graphic options <see cref="T:LazZiya.ImageResize.GraphicOptions"/></param>
             <returns></returns>
         </member>
-        <member name="T:LazZiya.ImageResize.Animated.AnimatedGifWaterMark">
-            <summary>
-            Add an image watermark to animated gif
-            </summary>
-        </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifWaterMark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedGif,System.String)">
-            <summary>
-            Draw image watermark
-            </summary>
-            <param name="img">The original image</param>
-            <param name="wmImgPath">Path to the watermark image file e.g. wwwroot\images\watermark.png</param>
-        </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifWaterMark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedGif,System.Drawing.Image)">
-            <summary>
-            Draw image watermark
-            </summary>
-            <param name="img">The original image</param>
-            <param name="wmImage">Watermark image</param>
-        </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifWaterMark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedGif,System.String,LazZiya.ImageResize.ImageWatermarkOptions)">
-            <summary>
-            Draw image watermark
-            </summary>
-            <param name="img">The original image</param>
-            <param name="wmImgPath">Path to the watermark image file e.g. wwwroot\images\watermark.png</param>
-            <param name="ops">Image watermark options <see cref="T:LazZiya.ImageResize.ImageWatermarkOptions"/></param>
-        </member>
-        <member name="M:LazZiya.ImageResize.Animated.AnimatedGifWaterMark.AddImageWatermark(LazZiya.ImageResize.Animated.AnimatedGif,System.Drawing.Image,LazZiya.ImageResize.ImageWatermarkOptions)">
-            <summary>
-            Draw image watermark.
-            <para>Notice regarding watermark opacity:</para>
-            <para>If watermark image needs to be resized, first resize the watermark image, 
-            then save it to the disc, and read it again with Image.FromFile.</para>
-            </summary>
-            <param name="img">The original image</param>
-            <param name="wmImage">Watermak image</param>
-            <param name="ops">Image watermark options <see cref="T:LazZiya.ImageResize.ImageWatermarkOptions"/></param>
-        </member>
         <member name="T:LazZiya.ImageResize.Animated.GifEncoder">
             <summary>
             Encodes multiple images as an animated gif to a stream. <br />
@@ -314,19 +324,19 @@
             Save and dispose
             </summary>
         </member>
-        <member name="T:LazZiya.ImageResize.AnimatedTextWatermark">
+        <member name="T:LazZiya.ImageResize.AnimatedImageTextWatermark">
             <summary>
             Add text watermark over the image.
             </summary>
         </member>
-        <member name="M:LazZiya.ImageResize.AnimatedTextWatermark.AddTextWatermark(LazZiya.ImageResize.Animated.AnimatedGif,System.String)">
+        <member name="M:LazZiya.ImageResize.AnimatedImageTextWatermark.AddTextWatermark(LazZiya.ImageResize.Animated.AnimatedImage,System.String)">
             <summary>
             Add text watermark over the image.
             </summary>
             <param name="img"></param>
             <param name="text"></param>
         </member>
-        <member name="M:LazZiya.ImageResize.AnimatedTextWatermark.AddTextWatermark(LazZiya.ImageResize.Animated.AnimatedGif,System.String,LazZiya.ImageResize.TextWatermarkOptions)">
+        <member name="M:LazZiya.ImageResize.AnimatedImageTextWatermark.AddTextWatermark(LazZiya.ImageResize.Animated.AnimatedImage,System.String,LazZiya.ImageResize.TextWatermarkOptions)">
             <summary>
             Add text watermark over the image.
             </summary>