From cce9c960261058727b5b46ac3e65ceb2dfca068a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enner=20P=C3=A9rez?= <ennerperez@gmail.com>
Date: Tue, 26 Apr 2016 01:43:00 -0430
Subject: [PATCH 1/2] Changelog updated

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 427c62d..1f14e9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Build bug
 
+### Added
+- Windows Forms Extensions
+
 ## [1.0.12] - 2016-04-22
 ### Changed
 - FontAwesome 4.6.1

From c84480690b0342f69874f4e974829cda7cb31782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enner=20P=C3=A9rez?= <ennerperez@gmail.com>
Date: Sat, 28 May 2016 23:08:27 -0400
Subject: [PATCH 2/2] Solution Standards

---
 .gitignore                                  |  4 +-
 .nuget/NuGet.config                         |  6 +++
 .nuget/NuGet.targets                        | 47 +++++++++++++++------
 CHANGELOG.md                                | 12 ++++--
 Pictograms.Forms/Extensions.cs              | 12 +++---
 Pictograms.Forms/Package.nuspec             |  2 +-
 Pictograms.Forms/Pictograms.Forms.csproj    |  4 +-
 Pictograms.Forms/Properties/AssemblyInfo.cs | 35 ++++-----------
 Pictograms/Package.nuspec                   |  2 +-
 Pictograms/Pictogram.cs                     |  7 +++
 Pictograms/Pictograms.csproj                | 14 ++----
 Pictograms/Pictograms/FontAwesome.cs        |  8 ++--
 Pictograms/Pictograms/Foundation.cs         |  8 ++--
 Pictograms/Pictograms/LinearIcons.cs        |  8 ++--
 Pictograms/Pictograms/MaterialDesign.cs     |  8 ++--
 Pictograms/Properties/AssemblyInfo.cs       | 41 +++++-------------
 Pictograms/Properties/Resources.resx        |  8 ++--
 README.md                                   | 23 ++++++++--
 pictograms.sln                              |  5 ++-
 19 files changed, 137 insertions(+), 117 deletions(-)
 create mode 100644 .nuget/NuGet.config

diff --git a/.gitignore b/.gitignore
index 001071c..426ef01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,6 +153,7 @@ publish/
 # NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets
+.nuget/NuGet.exe
 
 # Microsoft Azure Build Output
 csx/
@@ -234,5 +235,4 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
-
-*.ai
\ No newline at end of file
+/.editoricon.ai
diff --git a/.nuget/NuGet.config b/.nuget/NuGet.config
new file mode 100644
index 0000000..38448ac
--- /dev/null
+++ b/.nuget/NuGet.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
\ No newline at end of file
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
index 6d2756a..bee3426 100644
--- a/.nuget/NuGet.targets
+++ b/.nuget/NuGet.targets
@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+***********************************************************************************************
+  <Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
+  </Target>
+***********************************************************************************************
+-->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
@@ -13,7 +24,11 @@
     <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
 
     <!-- Download NuGet.exe if it does not already exist -->
-    <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">true</DownloadNuGetExe>
+
+    <!-- Exclude files in BuildPackage command -->
+    <ExcludeFiles Condition="'$(BuildPackage)' "></ExcludeFiles>
+
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(PackageSources)' == '' ">
@@ -36,14 +51,21 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
-    <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
+    <PackagesProjectConfig>packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
-    <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
-  </PropertyGroup>
+  <Choose>
+    <When Condition="Exists('$(PackagesProjectConfig)')">
+      <PropertyGroup>
+        <PackagesConfig>$(PackagesProjectConfig)</PackagesConfig>
+      </PropertyGroup>
+    </When>
+    <When Condition="Exists('packages.config')">
+      <PropertyGroup>
+        <PackagesConfig>packages.config</PackagesConfig>
+      </PropertyGroup>
+    </When>
+  </Choose>
 
   <PropertyGroup>
     <!-- NuGet command -->
@@ -51,7 +73,7 @@
     <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
 
     <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-    <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
+    <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
 
     <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
 
@@ -63,7 +85,8 @@
 
     <!-- Commands -->
     <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-    <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)"</BuildCommand>
+    <ExcludeArgs Condition="'$(ExcludeFiles)' != ''">-Exclude $(ExcludeFiles)</ExcludeArgs>
+    <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" $(ExcludeArgs) -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)"</BuildCommand>
 
     <!-- We need to ensure packages are restored prior to assembly resolve -->
     <BuildDependsOn Condition="$(RestorePackages) == 'true'">
@@ -78,7 +101,7 @@
     </BuildDependsOn>
   </PropertyGroup>
 
-  <Target Name="CheckPrerequisites">
+  <Target Name="CheckPrerequisites" Condition=" '$(OS)' == 'Windows_NT'">
     <!-- Raise an error if we're unable to locate nuget.exe  -->
     <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
     <!--
@@ -102,9 +125,9 @@
           Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
   </Target>
 
-  <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites" Condition="Exists('$(ProjectDir)Package.nuspec') AND $(ConfigurationName) == 'Release'">
+  <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites" Condition="Exists('$(ProjectDir)Package.nuspec') AND $(ConfigurationName) == 'Release' ">
     <Exec Command="$(BuildCommand)"
-          Condition=" '$(OS)' != 'Windows_NT' " />
+  Condition=" '$(OS)' != 'Windows_NT' " />
 
     <Exec Command="$(BuildCommand)"
           LogStandardErrorAsError="true"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f14e9d..27685aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.0.14] - 2016-04-26
+## [1.0.15] - [2016-05-28]
+### Fixed
+- Generics extensions
+
+## [1.0.14] - [2016-04-26]
 ### Changed
 - NETFX40 Base migrated
 
@@ -12,14 +16,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Windows Forms Extensions
 
-## [1.0.12] - 2016-04-22
+## [1.0.12] - [2016-04-22]
 ### Changed
 - FontAwesome 4.6.1
 
 ### Removed
 - Sample project
 
-## [1.0.1] - 2016-04-04
+## [1.0.1] - [2016-04-04]
 ### Changed
 - Following [SemVer](http://semver.org) properly with AppVeyor.
 - Solution build process
@@ -27,7 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - AppVeyor integration
 
-## [1.0.0] - 2016-03-02
+## [1.0.0] - [2016-03-02]
 ### Added
 - Fonts resources loader
 - Custom font loader
diff --git a/Pictograms.Forms/Extensions.cs b/Pictograms.Forms/Extensions.cs
index 81f4659..58cbaf9 100644
--- a/Pictograms.Forms/Extensions.cs
+++ b/Pictograms.Forms/Extensions.cs
@@ -14,34 +14,34 @@ public static class Extensions
 
         public static void SetImage<T>(this Control @this, object type, int size = 0, Color? color = null, Brush brush = null) where T : Pictogram
         {
-            var instance = Activator.CreateInstance<T>();
+            T instance = (T)Activator.CreateInstance(typeof(T), true);
             SetImage(@this, instance, type, size, color, brush);
         }
         public static void SetText<T>(this Control @this, object type, float size = 0) where T : Pictogram
         {
-            var instance = Activator.CreateInstance<T>();
+            T instance = (T)Activator.CreateInstance(typeof(T), true);
             SetText(@this, instance, type, size);
         }
 
         public static void SetImage<T>(this Component @this, object type, int size = 0, Color? color = null, Brush brush = null) where T : Pictogram
         {
-            var instance = Activator.CreateInstance<T>();
+            T instance = (T)Activator.CreateInstance(typeof(T), true);
             SetImage(@this, instance, type, size, color, brush);
         }
         public static void SetText<T>(this Component @this, object type, float size = 0) where T : Pictogram
         {
-            var instance = Activator.CreateInstance<T>();
+            T instance = (T)Activator.CreateInstance(typeof(T), true);
             SetText(@this, instance, type, size);
         }
 
         public static void SetIcon<T>(this NotifyIcon @this, object type, int size = 0, Color? color = null, Brush brush = null) where T : Pictogram
         {
-            var instance = Activator.CreateInstance<T>();
+            T instance = (T)Activator.CreateInstance(typeof(T), true);
             SetIcon(@this, instance, type, size, color, brush);
         }
         public static void SetIcon<T>(this ImageList @this, object type, int size = 0, Color? color = null, Brush brush = null) where T : Pictogram
         {
-            var instance = Activator.CreateInstance<T>();
+            T instance = (T)Activator.CreateInstance(typeof(T), true);
             SetIcon(@this, instance, type, size, color, brush);
         }
 
diff --git a/Pictograms.Forms/Package.nuspec b/Pictograms.Forms/Package.nuspec
index 59bb7a3..88653fb 100644
--- a/Pictograms.Forms/Package.nuspec
+++ b/Pictograms.Forms/Package.nuspec
@@ -11,7 +11,7 @@
     <iconUrl>https://raw.githubusercontent.com/ennerperez/pictograms/master/.editoricon.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Introducing fonts based pictograms for .NET Windows Forms projects</description>
-    <summary />
+    <summary>$description$</summary>
     <releaseNotes />
     <copyright>$copyright$</copyright>
     <language>en</language>
diff --git a/Pictograms.Forms/Pictograms.Forms.csproj b/Pictograms.Forms/Pictograms.Forms.csproj
index 58e5326..ba00e3f 100644
--- a/Pictograms.Forms/Pictograms.Forms.csproj
+++ b/Pictograms.Forms/Pictograms.Forms.csproj
@@ -56,12 +56,12 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\.nuget\NuGet.targets" Condition="Exists('..\.nuget\NuGet.targets')" />
+  <Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Pictograms.Forms/Properties/AssemblyInfo.cs b/Pictograms.Forms/Properties/AssemblyInfo.cs
index 4cd07bc..f1d96b2 100644
--- a/Pictograms.Forms/Properties/AssemblyInfo.cs
+++ b/Pictograms.Forms/Properties/AssemblyInfo.cs
@@ -4,42 +4,23 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// La información general de un ensamblado se controla mediante el siguiente 
-// conjunto de atributos. Cambie estos valores de atributo para modificar la información
-// asociada con un ensamblado.
-
 [assembly: AssemblyTitle("Pictograms Forms")]
 [assembly: AssemblyDescription("Fonts based pictograms for .NET (WinForms)")]
 #if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
+[assembly: AssemblyConfiguration("DEBUG")]
 #else
-[assembly: AssemblyConfiguration("Release")]
+[assembly: AssemblyConfiguration("RELEASE")]
 #endif
 [assembly: AssemblyCompany("Enner Pérez")]
 [assembly: AssemblyProduct("Pictograms Forms")]
-[assembly: AssemblyCopyright("© Enner Pérez. All rights reserved.")]
-[assembly: AssemblyTrademark("© Enner Pérez")]
-
-// Si establece ComVisible en false, los tipos de este ensamblado no estarán visibles 
-// para los componentes COM.  Si necesita obtener acceso a un tipo de este ensamblado desde 
-// COM, establezca el atributo ComVisible en true en este tipo.
+[assembly: AssemblyCopyright("Copyright © Enner Pérez")]
+[assembly: AssemblyTrademark("Pictograms Forms")]
 
 [assembly: ComVisible(true)]
 
-// El siguiente GUID sirve como id. de typelib si este proyecto se expone a COM.
-[assembly: Guid("45872aa9-7722-49b4-864d-b03f11ab5b3f")]
+[assembly: Guid("45872AA9-7722-49B4-864D-B03F11AB5B3F")]
 
-// La información de versión de un ensamblado consta de los cuatro valores siguientes:
-//
-//      Versión principal
-//      Versión secundaria 
-//      Número de compilación
-//      Revisión
-//
-// Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión 
-// mediante el carácter '*', como se muestra a continuación:
-// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguage("en")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
-//[assembly: AssemblyInformationalVersion("1.0.0-master")]
diff --git a/Pictograms/Package.nuspec b/Pictograms/Package.nuspec
index a5764be..62785b8 100644
--- a/Pictograms/Package.nuspec
+++ b/Pictograms/Package.nuspec
@@ -11,7 +11,7 @@
     <iconUrl>https://raw.githubusercontent.com/ennerperez/pictograms/master/.editoricon.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Introducing fonts based pictograms for .NET solutions</description>
-    <summary />
+    <summary>$description$</summary>
     <releaseNotes />
     <copyright>$copyright$</copyright>
     <language>en</language>
diff --git a/Pictograms/Pictogram.cs b/Pictograms/Pictogram.cs
index 876d275..a910f87 100644
--- a/Pictograms/Pictogram.cs
+++ b/Pictograms/Pictogram.cs
@@ -6,6 +6,13 @@ namespace System.Drawing
     public class Pictogram : IDisposable
     {
 
+        internal static Pictogram instance;
+
+        public static T GetInstance<T>() where T: Pictogram
+        {
+            return (T)instance;
+        }
+
         public Pictogram()
         {
         }
diff --git a/Pictograms/Pictograms.csproj b/Pictograms/Pictograms.csproj
index a80aa6a..3e8cc9f 100644
--- a/Pictograms/Pictograms.csproj
+++ b/Pictograms/Pictograms.csproj
@@ -45,15 +45,6 @@
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\CHANGELOG.md">
-      <Link>CHANGELOG.md</Link>
-    </None>
-    <None Include="..\LICENSE">
-      <Link>LICENSE</Link>
-    </None>
-    <None Include="..\README.md">
-      <Link>README.md</Link>
-    </None>
     <None Include="Fonts\fontawesome-webfont.ttf" />
     <None Include="Fonts\foundation-icons.ttf" />
     <None Include="Fonts\linearicons-free.ttf" />
@@ -73,15 +64,16 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\.nuget\NuGet.targets" Condition="Exists('..\.nuget\NuGet.targets')" />
+  <Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Pictograms/Pictograms/FontAwesome.cs b/Pictograms/Pictograms/FontAwesome.cs
index 8a80d43..9aef4e9 100644
--- a/Pictograms/Pictograms/FontAwesome.cs
+++ b/Pictograms/Pictograms/FontAwesome.cs
@@ -16,8 +16,6 @@ public class FontAwesome : Pictogram
 
         #region Singleton
 
-        private static FontAwesome instance;
-
         /// <summary>
         /// Initializes the <see cref="Icon" /> class by loading the font from resources upon first use.
         /// </summary>
@@ -31,12 +29,16 @@ public static FontAwesome Instance
             {
                 if (instance == null)
                     instance = new FontAwesome();
-                return instance;
+                return (FontAwesome)instance;
             }
         }
 
         #endregion
 
+        public FontAwesome(bool @default) : this()
+        {
+        }
+
         #region Statics
 
         public static Image GetImage(IconType type, int size, Brush brush)
diff --git a/Pictograms/Pictograms/Foundation.cs b/Pictograms/Pictograms/Foundation.cs
index 719e612..7fde87c 100644
--- a/Pictograms/Pictograms/Foundation.cs
+++ b/Pictograms/Pictograms/Foundation.cs
@@ -15,8 +15,6 @@ public class Foundation : Pictogram
 
         #region Singleton
 
-        private static Foundation instance;
-
         /// <summary>
         /// Initializes the <see cref="Icon" /> class by loading the font from resources upon first use.
         /// </summary>
@@ -30,12 +28,16 @@ public static Foundation Instance
             {
                 if (instance == null)
                     instance = new Foundation();
-                return instance;
+                return (Foundation)instance;
             }
         }
 
         #endregion
 
+        public Foundation(bool @default) : this()
+        {
+        }
+
         #region Statics
 
         public static Image GetImage(IconType type, int size, Brush brush)
diff --git a/Pictograms/Pictograms/LinearIcons.cs b/Pictograms/Pictograms/LinearIcons.cs
index 677813f..1ab2771 100644
--- a/Pictograms/Pictograms/LinearIcons.cs
+++ b/Pictograms/Pictograms/LinearIcons.cs
@@ -15,8 +15,6 @@ public class LinearIcons : Pictogram
 
         #region Singleton
 
-        private static LinearIcons instance;
-
         /// <summary>
         /// Initializes the <see cref="Icon" /> class by loading the font from resources upon first use.
         /// </summary>
@@ -30,12 +28,16 @@ public static LinearIcons Instance
             {
                 if (instance == null)
                     instance = new LinearIcons();
-                return instance;
+                return (LinearIcons)instance;
             }
         }
 
         #endregion
 
+        public LinearIcons(bool @default) : this()
+        {
+        }
+
         #region Statics
 
         public static Image GetImage(IconType type, int size, Brush brush)
diff --git a/Pictograms/Pictograms/MaterialDesign.cs b/Pictograms/Pictograms/MaterialDesign.cs
index 2106934..833fa3d 100644
--- a/Pictograms/Pictograms/MaterialDesign.cs
+++ b/Pictograms/Pictograms/MaterialDesign.cs
@@ -15,8 +15,6 @@ public class MaterialDesign : Pictogram
 
         #region Singleton
 
-        private static MaterialDesign instance;
-
         /// <summary>
         /// Initializes the <see cref="Icon" /> class by loading the font from resources upon first use.
         /// </summary>
@@ -30,12 +28,16 @@ public static MaterialDesign Instance
             {
                 if (instance == null)
                     instance = new MaterialDesign();
-                return instance;
+                return (MaterialDesign)instance;
             }
         }
 
         #endregion
 
+        public MaterialDesign(bool @default) : this()
+        {
+        }
+
         #region Statics
 
         public static Image GetImage(IconType type, int size, Brush brush)
diff --git a/Pictograms/Properties/AssemblyInfo.cs b/Pictograms/Properties/AssemblyInfo.cs
index 11c5796..7a71464 100644
--- a/Pictograms/Properties/AssemblyInfo.cs
+++ b/Pictograms/Properties/AssemblyInfo.cs
@@ -1,45 +1,26 @@
-using System;
-using System.Reflection;
-using System.Resources;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Resources;
 
-// La información general de un ensamblado se controla mediante el siguiente 
-// conjunto de atributos. Cambie estos valores de atributo para modificar la información
-// asociada con un ensamblado.
 
 [assembly: AssemblyTitle("Pictograms")]
 [assembly: AssemblyDescription("Fonts based pictograms for .NET")]
 #if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
+[assembly: AssemblyConfiguration("DEBUG")]
 #else
-[assembly: AssemblyConfiguration("Release")]
+[assembly: AssemblyConfiguration("RELEASE")]
 #endif
 [assembly: AssemblyCompany("Enner Pérez")]
 [assembly: AssemblyProduct("Pictograms")]
-[assembly: AssemblyCopyright("© Enner Pérez. All rights reserved.")]
-[assembly: AssemblyTrademark("© Enner Pérez")]
-
-// Si establece ComVisible en false, los tipos de este ensamblado no estarán visibles 
-// para los componentes COM.  Si necesita obtener acceso a un tipo de este ensamblado desde 
-// COM, establezca el atributo ComVisible en true en este tipo.
+[assembly: AssemblyCopyright("Copyright © Enner Pérez")]
+[assembly: AssemblyTrademark("Pictograms")]
+[assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(true)]
 
-// El siguiente GUID sirve como id. de typelib si este proyecto se expone a COM.
-[assembly: Guid("0d9e79a0-dbcf-42a6-b0a8-6234f3aae253")]
-
-// La información de versión de un ensamblado consta de los cuatro valores siguientes:
-//
-//      Versión principal
-//      Versión secundaria 
-//      Número de compilación
-//      Revisión
-//
-// Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión 
-// mediante el carácter '*', como se muestra a continuación:
-// [assembly: AssemblyVersion("1.0.*")]
+[assembly: Guid("0D9E79A0-DBCF-42A6-B0A8-6234F3AAE253")]
 
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
-//[assembly: AssemblyInformationalVersion("1.1.0-master")]
+[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: NeutralResourcesLanguage("en")]
diff --git a/Pictograms/Properties/Resources.resx b/Pictograms/Properties/Resources.resx
index 69da766..44dca05 100644
--- a/Pictograms/Properties/Resources.resx
+++ b/Pictograms/Properties/Resources.resx
@@ -119,15 +119,15 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="fontawesome_webfont" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\fonts\fontawesome-webfont.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Fonts\fontawesome-webfont.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="foundation_icons" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\fonts\foundation-icons.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Fonts\foundation-icons.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="linearicons_free" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\fonts\linearicons-free.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Fonts\linearicons-free.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="MaterialIcons_Regular" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\fonts\materialicons-regular.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Fonts\MaterialIcons-Regular.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/README.md b/README.md
index 01a1112..686e201 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 ![logo](https://raw.githubusercontent.com/ennerperez/pictograms/master/.editoricon.png)
 
 # Pictograms
+
 Introducing fonts based pictograms for .NET solutions
 
 [![Build status](https://ci.appveyor.com/api/projects/status/kt6j6amgiphh8f04?svg=true)](https://ci.appveyor.com/project/ennerperez/pictograms)
@@ -22,11 +23,27 @@ See the [changelog](CHANGELOG.md) for changes.
 - [x] Windows Forms Extensions
 - [ ] Windows Forms Components
 
-## Implementing in your application
+## Table of contents
+
+* [Implementing](#implementing)
+* [Bugs and feature requests](#bugs-and-feature-requests)
+* [Documentation](#documentation)
+* [License](#license)
+
+### Implementing
 
 **Add the library to your project**
 
 Add the [NuGet Package](https://www.nuget.org/packages/System.Drawing.Pictograms/). Right click on your project and click 'Manage NuGet Packages...'. Search for 'Pictograms' and click on install. Once installed the library will be included in your project references. (Or install it through the package manager console: PM> Install-Package System.Drawing.Pictograms)
 
-## License
-[The MIT License (MIT)](LICENSE)
\ No newline at end of file
+### Bugs and feature requests
+
+Have a bug or a feature request? Please first search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/ennerperez/System.Drawing.Pictograms/issues/new).
+
+### Documentation
+
+No more documentation required for now.
+
+### License
+
+Code released under [The MIT License](LICENSE)
\ No newline at end of file
diff --git a/pictograms.sln b/pictograms.sln
index e2f0bae..1b4d27a 100644
--- a/pictograms.sln
+++ b/pictograms.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".docs", ".docs", "{CE3C4058-F9DA-4C61-AFCE-DDEEC8BD5DCB}"
 	ProjectSection(SolutionItems) = preProject
@@ -12,12 +12,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".docs", ".docs", "{CE3C4058
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".files", ".files", "{5D1381AE-869F-42A3-8753-C2AF649078D0}"
 	ProjectSection(SolutionItems) = preProject
+		.editoricon.png = .editoricon.png
 		.gitignore = .gitignore
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FE0EED20-DED7-414B-AA1F-80AF7AF35419}"
 	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.config = .nuget\NuGet.config
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject