diff --git a/Unosquare.Labs.EmbedIO.Command/App.config b/Unosquare.Labs.EmbedIO.Command/App.config
index 3249e041d..8c9939b80 100644
--- a/Unosquare.Labs.EmbedIO.Command/App.config
+++ b/Unosquare.Labs.EmbedIO.Command/App.config
@@ -13,9 +13,6 @@
             <setting name="ServerAddress" serializeAs="String">
                 <value>http://localhost:9696/</value>
             </setting>
-            <setting name="HtmlRootPath" serializeAs="String">
-                <value>C:\unosquare\embedio\Unosquare.Labs.EmbedIO.Samples\html</value>
-            </setting>
             <setting name="HtmlDefaultDocument" serializeAs="String">
                 <value>index.html</value>
             </setting>
diff --git a/Unosquare.Labs.EmbedIO.Command/Options.cs b/Unosquare.Labs.EmbedIO.Command/Options.cs
new file mode 100644
index 000000000..e91728262
--- /dev/null
+++ b/Unosquare.Labs.EmbedIO.Command/Options.cs
@@ -0,0 +1,28 @@
+using CommandLine;
+using CommandLine.Text;
+using System.Collections.Generic;
+
+namespace Unosquare.Labs.EmbedIO.Command
+{
+    internal class Options
+    {
+        // TODO: Get a JSON file?
+        //[ValueList(typeof (List<string>), MaximumElements = 1)]
+        //public IList<string> Items { get; set; }
+
+        [Option('p', "path", Required = true, HelpText = "WWW-root path.")]
+        public string RootPath { get; set; }
+
+        [OptionList('a', "api", Separator = ',', HelpText = "Specify assemblies to load, separated by a comma.")]
+        public IList<string> ApiAssemblies { get; set; }
+
+        // TODO: Add url
+
+        [HelpOption]
+        public string GetUsage()
+        {
+            return HelpText.AutoBuild(this,
+                (HelpText current) => HelpText.DefaultParsingErrorsHandler(this, current));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Unosquare.Labs.EmbedIO.Command/Program.cs b/Unosquare.Labs.EmbedIO.Command/Program.cs
index 2fdcee2fd..f7c4e4428 100644
--- a/Unosquare.Labs.EmbedIO.Command/Program.cs
+++ b/Unosquare.Labs.EmbedIO.Command/Program.cs
@@ -1,21 +1,32 @@
 namespace Unosquare.Labs.EmbedIO.Command
 {
+    using CommandLine;
     using System;
+    using System.Linq;
+    using System.Reflection;
     using Unosquare.Labs.EmbedIO.Log;
+    using Unosquare.Labs.EmbedIO.Modules;
 
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static readonly SimpleConsoleLog Log = new SimpleConsoleLog();
+
+        private static void Main(string[] args)
         {
+            var options = new Options();
+
             Console.WriteLine("Unosquare.Labs.EmbedIO Web Server");
+
+            if (!Parser.Default.ParseArguments(args, options)) return;
+
             Console.WriteLine("  Command-Line Utility: Press any key to stop the server.");
 
-            using (var server = new WebServer(Properties.Settings.Default.ServerAddress, new SimpleConsoleLog()))
+            using (var server = new WebServer(Properties.Settings.Default.ServerAddress, Log))
             {
                 if (Properties.Settings.Default.UseLocalSessionModule)
-                    server.RegisterModule(new Modules.LocalSessionModule());
+                    server.RegisterModule(new LocalSessionModule());
 
-                var staticFilesModule = new Modules.StaticFilesModule(Properties.Settings.Default.HtmlRootPath)
+                var staticFilesModule = new StaticFilesModule(options.RootPath)
                 {
                     DefaultDocument = Properties.Settings.Default.HtmlDefaultDocument,
                     DefaultExtension = Properties.Settings.Default.HtmlDefaultExtension,
@@ -24,10 +35,72 @@ static void Main(string[] args)
 
                 server.RegisterModule(staticFilesModule);
 
+                if (options.ApiAssemblies != null && options.ApiAssemblies.Count > 0)
+                {
+                    foreach (var api in options.ApiAssemblies)
+                    {
+                        Log.DebugFormat("Checking API {0}", api);
+                        LoadApi(api, server);
+                    }
+                }
+
                 // start the server
                 server.RunAsync();
                 Console.ReadKey(true);
             }
         }
+
+        private static void LoadApi(string apiPath, WebServer server)
+        {
+            try
+            {
+                var assembly = Assembly.LoadFile(apiPath);
+
+                if (assembly == null) return;
+
+                var types = assembly.GetTypes();
+
+                // Load WebApiModules
+                var apiControllers =
+                    types.Where(x => x.IsClass && !x.IsAbstract && x.IsSubclassOf(typeof (WebApiController))).ToArray();
+
+                if (apiControllers.Any())
+                {
+                    server.RegisterModule(new WebApiModule());
+
+                    foreach (var apiController in apiControllers)
+                    {
+                        server.Module<WebApiModule>().RegisterController(apiController);
+                        Log.DebugFormat("Registering {0} WebAPI", apiController.Name);
+                    }
+                }
+                else
+                {
+                    Log.DebugFormat("{0} does not have any WebAPI", apiPath);
+                }
+
+                // Load WebSocketsModules
+                var sockerServers = types.Where(x => x.BaseType == typeof (WebSocketsServer)).ToArray();
+
+                if (sockerServers.Any())
+                {
+                    server.RegisterModule(new WebSocketsModule());
+
+                    foreach (var socketServer in sockerServers)
+                    {
+                        server.Module<WebSocketsModule>().RegisterWebSocketsServer(socketServer);
+                        Log.DebugFormat("Registering {0} WebSocket", socketServer.Name);
+                    }
+                }
+                else
+                {
+                    Log.DebugFormat("{0} does not have any WebSocket", apiPath);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Unosquare.Labs.EmbedIO.Command/Properties/Settings.Designer.cs b/Unosquare.Labs.EmbedIO.Command/Properties/Settings.Designer.cs
index 6ebf0160e..7115a1959 100644
--- a/Unosquare.Labs.EmbedIO.Command/Properties/Settings.Designer.cs
+++ b/Unosquare.Labs.EmbedIO.Command/Properties/Settings.Designer.cs
@@ -32,15 +32,6 @@ public string ServerAddress {
             }
         }
         
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("C:\\unosquare\\embedio\\Unosquare.Labs.EmbedIO.Samples\\html")]
-        public string HtmlRootPath {
-            get {
-                return ((string)(this["HtmlRootPath"]));
-            }
-        }
-        
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("index.html")]
diff --git a/Unosquare.Labs.EmbedIO.Command/Properties/Settings.settings b/Unosquare.Labs.EmbedIO.Command/Properties/Settings.settings
index ad4102be3..7808cb9fe 100644
--- a/Unosquare.Labs.EmbedIO.Command/Properties/Settings.settings
+++ b/Unosquare.Labs.EmbedIO.Command/Properties/Settings.settings
@@ -5,9 +5,6 @@
     <Setting Name="ServerAddress" Type="System.String" Scope="Application">
       <Value Profile="(Default)">http://localhost:9696/</Value>
     </Setting>
-    <Setting Name="HtmlRootPath" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">C:\unosquare\embedio\Unosquare.Labs.EmbedIO.Samples\html</Value>
-    </Setting>
     <Setting Name="HtmlDefaultDocument" Type="System.String" Scope="Application">
       <Value Profile="(Default)">index.html</Value>
     </Setting>
diff --git a/Unosquare.Labs.EmbedIO.Command/README.md b/Unosquare.Labs.EmbedIO.Command/README.md
new file mode 100644
index 000000000..8a58343ed
--- /dev/null
+++ b/Unosquare.Labs.EmbedIO.Command/README.md
@@ -0,0 +1,15 @@
+## EmbedIO CLI
+
+Start any web folder or EmbedIO-enabled DLL from command line.
+
+### Run web folder (static content only)
+
+```
+$ embediocli -p c:\wwwroot
+```
+
+### Run web folder with WebAPI or WebSocket Assembly
+
+```
+$ embediocli -p c:\wwwroot --api mywebapi.dll
+```
\ No newline at end of file
diff --git a/Unosquare.Labs.EmbedIO.Command/Unosquare.Labs.EmbedIO.Command.csproj b/Unosquare.Labs.EmbedIO.Command/Unosquare.Labs.EmbedIO.Command.csproj
index e1bbe273b..3074bca4f 100644
--- a/Unosquare.Labs.EmbedIO.Command/Unosquare.Labs.EmbedIO.Command.csproj
+++ b/Unosquare.Labs.EmbedIO.Command/Unosquare.Labs.EmbedIO.Command.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unosquare.Labs.EmbedIO.Command</RootNamespace>
-    <AssemblyName>Unosquare.Labs.EmbedIO.Command</AssemblyName>
+    <AssemblyName>embediocli</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -33,7 +33,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>favicon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -43,6 +50,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
@@ -53,10 +61,12 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Unosquare.Labs.EmbedIO\Unosquare.Labs.EmbedIO.csproj">
@@ -64,6 +74,9 @@
       <Name>Unosquare.Labs.EmbedIO</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="favicon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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/Unosquare.Labs.EmbedIO.Command/favicon.ico b/Unosquare.Labs.EmbedIO.Command/favicon.ico
new file mode 100644
index 000000000..0aa540b79
Binary files /dev/null and b/Unosquare.Labs.EmbedIO.Command/favicon.ico differ
diff --git a/Unosquare.Labs.EmbedIO.Command/packages.config b/Unosquare.Labs.EmbedIO.Command/packages.config
new file mode 100644
index 000000000..0d9f59112
--- /dev/null
+++ b/Unosquare.Labs.EmbedIO.Command/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/Unosquare.Labs.EmbedIO.Samples/RestApiSample.cs b/Unosquare.Labs.EmbedIO.Samples/RestApiSample.cs
index e46b3bd6e..5cc26323f 100644
--- a/Unosquare.Labs.EmbedIO.Samples/RestApiSample.cs
+++ b/Unosquare.Labs.EmbedIO.Samples/RestApiSample.cs
@@ -13,7 +13,13 @@
     public static class RestApiSample
     {
         private const string RelativePath = "/api/";
-        public static List<Person> People { get; private set; }
+
+        public static List<Person> People = new List<Person>
+        {
+            new Person() {Key = 1, Name = "Mario Di Vece", Age = 31, EmailAddress = "mario@unosquare.com"},
+            new Person() {Key = 2, Name = "Geovanni Perez", Age = 32, EmailAddress = "geovanni.perez@unosquare.com"},
+            new Person() {Key = 3, Name = "Luis Gonzalez", Age = 29, EmailAddress = "luis.gonzalez@unosquare.com"},
+        };
 
         /// <summary>
         /// Here we add the WebApiModule to our Web Server and register our controller classes.
@@ -23,13 +29,6 @@ public static class RestApiSample
         /// <param name="server">The server.</param>
         public static void Setup(WebServer server)
         {
-            People = new List<Person>()
-            {
-                new Person() {Key = 1, Name = "Mario Di Vece", Age = 31, EmailAddress = "mario@unosquare.com"},
-                new Person() {Key = 2, Name = "Geovanni Perez", Age = 32, EmailAddress = "geovanni.perez@unosquare.com"},
-                new Person() {Key = 3, Name = "Luis Gonzalez", Age = 29, EmailAddress = "luis.gonzalez@unosquare.com"},
-            };
-
             foreach (var person in People)
             {
                 person.PhotoUrl = GetGravatarUrl(person.EmailAddress);
@@ -41,22 +40,23 @@ public static void Setup(WebServer server)
 
         private static string GetGravatarUrl(string emailAddress)
         {
-            return string.Format("http://www.gravatar.com/avatar/{0}.png?s=100", HashMD5(emailAddress));
+            return string.Format("http://www.gravatar.com/avatar/{0}.png?s=100", HashMd5(emailAddress));
         }
 
-        private static string HashMD5(string input)
+        private static string HashMd5(string input)
         {
             // step 1, calculate MD5 hash from input
-            MD5 md5 = System.Security.Cryptography.MD5.Create();
-            byte[] inputBytes = System.Text.Encoding.ASCII.GetBytes(input);
+            MD5 md5 = MD5.Create();
+            byte[] inputBytes = Encoding.ASCII.GetBytes(input);
             byte[] hash = md5.ComputeHash(inputBytes);
 
             // step 2, convert byte array to hex string
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             for (int i = 0; i < hash.Length; i++)
             {
                 sb.Append(hash[i].ToString("x2"));
             }
+
             return sb.ToString();
         }
 
diff --git a/Unosquare.Labs.EmbedIO.Samples/WebSocketsSample.cs b/Unosquare.Labs.EmbedIO.Samples/WebSocketsSample.cs
index bdc672bb2..f77471457 100644
--- a/Unosquare.Labs.EmbedIO.Samples/WebSocketsSample.cs
+++ b/Unosquare.Labs.EmbedIO.Samples/WebSocketsSample.cs
@@ -16,7 +16,7 @@ public static class WebSocketsSample
         public static void Setup(WebServer server)
         {
             server.RegisterModule(new WebSocketsModule());
-            server.Module<WebSocketsModule>().RegisterWebSocketsServer<WebSocketsChatServer>("/chat");
+            server.Module<WebSocketsModule>().RegisterWebSocketsServer<WebSocketsChatServer>();
             server.Module<WebSocketsModule>().RegisterWebSocketsServer<WebSocketsTerminalServer>("/terminal");
         }
     }
@@ -24,6 +24,7 @@ public static void Setup(WebServer server)
     /// <summary>
     /// Defines a very simple chat server
     /// </summary>
+    [WebSocketHandler("/chat")]
     public class WebSocketsChatServer : WebSocketsServer
     {
 
diff --git a/Unosquare.Labs.EmbedIO/Modules/WebApiModule.cs b/Unosquare.Labs.EmbedIO/Modules/WebApiModule.cs
index e882f0db2..4fabebbe3 100644
--- a/Unosquare.Labs.EmbedIO/Modules/WebApiModule.cs
+++ b/Unosquare.Labs.EmbedIO/Modules/WebApiModule.cs
@@ -90,10 +90,17 @@ public void RegisterController<T>()
             if (ControllerTypes.Contains(typeof (T)))
                 throw new ArgumentException("Controller types must be unique within the module");
 
+            RegisterController(typeof (T));
+        }
+
+        /// <summary>
+        /// Registers the controller.
+        /// </summary>
+        public void RegisterController(Type controllerType)
+        {
             var protoDelegate = new ResponseHandler((server, context) => true);
 
-            var methods = typeof (T).GetMethods(System.Reflection.BindingFlags.Instance |
-                                                System.Reflection.BindingFlags.Public)
+            var methods = controllerType.GetMethods(BindingFlags.Instance | BindingFlags.Public)
                 .Where(m => m.ReturnType == protoDelegate.Method.ReturnType
                             && m.GetParameters().Select(pi => pi.ParameterType)
                                 .SequenceEqual(protoDelegate.Method.GetParameters()
@@ -114,7 +121,7 @@ public void RegisterController<T>()
                     else
                         DelegateMap.Add(path, delegatePath); // add
 
-                    var delegatePair = new Tuple<Type, MethodInfo>(typeof (T), method);
+                    var delegatePair = new Tuple<Type, MethodInfo>(controllerType, method);
                     if (DelegateMap[path].ContainsKey(attribute.Verb))
                         DelegateMap[path][attribute.Verb] = delegatePair; // update
                     else
@@ -122,10 +129,8 @@ public void RegisterController<T>()
                 }
             }
 
-            ControllerTypes.Add(typeof (T));
-
+            ControllerTypes.Add(controllerType);
         }
-
     }
 
     /// <summary>
diff --git a/Unosquare.Labs.EmbedIO/Modules/WebSocketsModule.cs b/Unosquare.Labs.EmbedIO/Modules/WebSocketsModule.cs
index d683d8029..ad3f09567 100644
--- a/Unosquare.Labs.EmbedIO/Modules/WebSocketsModule.cs
+++ b/Unosquare.Labs.EmbedIO/Modules/WebSocketsModule.cs
@@ -61,6 +61,37 @@ public override string Name
             get { return "WebSockets Module"; }
         }
 
+        /// <summary>
+        /// Registers the web sockets server given a WebSocketsServer Type.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <exception cref="ArgumentException">Argument 'path' cannot be null;path</exception>
+        public void RegisterWebSocketsServer<T>()
+            where T : WebSocketsServer, new()
+        {
+            RegisterWebSocketsServer(typeof (T));
+        }
+
+        /// <summary>
+        /// Registers the web sockets server given a WebSocketsServer Type.
+        /// </summary>
+        /// <param name="socketType"></param>
+        /// <exception cref="ArgumentException">Argument 'socketType' cannot be null;socketType</exception>
+        public void RegisterWebSocketsServer(Type socketType)
+        {
+            if (socketType == null)
+                throw new ArgumentException("Argument 'socketType' cannot be null", "socketType");
+
+            var attribute =
+                socketType.GetCustomAttributes(typeof (WebSocketHandlerAttribute), true).FirstOrDefault() as
+                    WebSocketHandlerAttribute;
+
+            if (attribute == null)
+                throw new ArgumentException("Argument 'socketType' needs a WebSocketHandlerAttribute", "socketType");
+
+            this.ServerMap[attribute.Path] = (WebSocketsServer) Activator.CreateInstance(socketType);
+        }
+
         /// <summary>
         /// Registers the web sockets server given a WebSocketsServer Type.
         /// </summary>
@@ -95,6 +126,34 @@ public void RegisterWebSocketsServer<T>(string path, T server)
         }
     }
 
+    /// <summary>
+    /// Decorate methods within controllers with this attribute in order to make them callable from the Web API Module
+    /// Method Must match the WebServerModule.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class WebSocketHandlerAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WebSocketHandlerAttribute"/> class.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <exception cref="System.ArgumentException">The argument 'paths' must be specified.</exception>
+        public WebSocketHandlerAttribute(string path)
+        {
+            if (path == null || string.IsNullOrWhiteSpace(path))
+                throw new ArgumentException("The argument 'path' must be specified.");
+
+            this.Path = path;
+        }
+
+        /// <summary>
+        /// Gets or sets the path.
+        /// </summary>
+        /// <value>
+        /// The paths.
+        /// </value>
+        public string Path { get; protected set; }
+    }
 
     /// <summary>
     /// A base class that defines how to handle WebSockets connections.
diff --git a/packages/repositories.config b/packages/repositories.config
index 4e03ea4c5..ec742d9b5 100644
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
+  <repository path="..\Unosquare.Labs.EmbedIO.Command\packages.config" />
   <repository path="..\Unosquare.Labs.EmbedIO.Samples\packages.config" />
   <repository path="..\Unosquare.Labs.EmbedIO\packages.config" />
 </repositories>
\ No newline at end of file