diff --git a/src/Noobot.Toolbox.Tests.Integration/Noobot.Toolbox.Tests.Integration.csproj b/src/Noobot.Toolbox.Tests.Integration/Noobot.Toolbox.Tests.Integration.csproj
index cba63cd..976ae80 100644
--- a/src/Noobot.Toolbox.Tests.Integration/Noobot.Toolbox.Tests.Integration.csproj
+++ b/src/Noobot.Toolbox.Tests.Integration/Noobot.Toolbox.Tests.Integration.csproj
@@ -40,67 +40,123 @@
..\..\packages\Flurl.2.3.0\lib\netstandard1.4\Flurl.dll
-
- ..\..\packages\Flurl.Http.1.1.1\lib\net45\Flurl.Http.dll
+
+ ..\..\packages\Flurl.Http.1.1.2\lib\net45\Flurl.Http.dll
-
- ..\..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll
+
+ ..\..\packages\HttpMachine.PCL.3.0.1\lib\netstandard1\HttpMachine.dll
+
+
+ ..\..\packages\SocketLite.PCL.4.0.6\lib\net45\ISocketLite.PCL.dll
+
+
+ ..\..\packages\WebsocketClientLite.PCL.4.0.6\lib\netstandard1.2\IWebsocketClientLite.PCL.dll
+
+
+ ..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll
..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
-
- ..\..\packages\Noobot.Core.2.0.18\lib\net461\Noobot.Core.dll
+
+ ..\..\packages\Noobot.Core.3.0.0\lib\net461\Noobot.Core.dll
..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll
-
- ..\..\packages\SlackConnector.3.1.236\lib\net461\SlackConnector.dll
+
+ ..\..\packages\SlackConnector.4.0.0\lib\net461\SlackConnector.dll
+
+
+ ..\..\packages\SocketLite.PCL.4.0.6\lib\net45\SocketLite.dll
..\..\packages\StructureMap.4.5.1\lib\net45\StructureMap.dll
+
+ ..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll
+
+
+
+ ..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll
+
-
- ..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+ ..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+
+ ..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll
+
+
+ ..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
+
+
+
+ ..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll
-
- ..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll
+
+ ..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll
-
- ..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll
+
+ ..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll
-
- ..\..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll
+
+ ..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll
+
+
+ ..\..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll
+
+
+
+ ..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll
+
+
+ ..\..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll
+
+
+ ..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll
+
+
+ ..\..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll
+
+
+ ..\..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll
- ..\..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll
+ ..\..\packages\System.Reflection.TypeExtensions.4.3.0\lib\net46\System.Reflection.TypeExtensions.dll
+
+
+ ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
- ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll
+ ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll
-
- ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll
+
+ ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll
-
- ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll
+
+ ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll
-
- ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
+
+ ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
-
- ..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll
+
+ ..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll
+
-
- ..\..\packages\websocket-sharp-with-proxy-support.1.9.1\lib\net35-client\websocket-sharp-with-proxy-support.dll
+
+ ..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll
+
+
+ ..\..\packages\WebsocketClientLite.PCL.4.0.6\lib\netstandard1.2\WebsocketClientLite.PCL.dll
+
diff --git a/src/Noobot.Toolbox.Tests.Integration/app.config b/src/Noobot.Toolbox.Tests.Integration/app.config
index 7b04441..3a644ab 100644
--- a/src/Noobot.Toolbox.Tests.Integration/app.config
+++ b/src/Noobot.Toolbox.Tests.Integration/app.config
@@ -16,7 +16,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Noobot.Toolbox.Tests.Integration/packages.config b/src/Noobot.Toolbox.Tests.Integration/packages.config
index 0b4e05c..e9d9867 100644
--- a/src/Noobot.Toolbox.Tests.Integration/packages.config
+++ b/src/Noobot.Toolbox.Tests.Integration/packages.config
@@ -3,25 +3,68 @@
-
-
+
+
+
+
+
-
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Noobot.Toolbox.Tests.Unit/Noobot.Toolbox.Tests.Unit.csproj b/src/Noobot.Toolbox.Tests.Unit/Noobot.Toolbox.Tests.Unit.csproj
index 47bcf4a..e035803 100644
--- a/src/Noobot.Toolbox.Tests.Unit/Noobot.Toolbox.Tests.Unit.csproj
+++ b/src/Noobot.Toolbox.Tests.Unit/Noobot.Toolbox.Tests.Unit.csproj
@@ -40,67 +40,123 @@
..\..\packages\Flurl.2.3.0\lib\netstandard1.4\Flurl.dll
-
- ..\..\packages\Flurl.Http.1.1.1\lib\net45\Flurl.Http.dll
+
+ ..\..\packages\Flurl.Http.1.1.2\lib\net45\Flurl.Http.dll
-
- ..\..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll
+
+ ..\..\packages\HttpMachine.PCL.3.0.1\lib\netstandard1\HttpMachine.dll
+
+
+ ..\..\packages\SocketLite.PCL.4.0.6\lib\net45\ISocketLite.PCL.dll
+
+
+ ..\..\packages\WebsocketClientLite.PCL.4.0.6\lib\netstandard1.2\IWebsocketClientLite.PCL.dll
+
+
+ ..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll
..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
-
- ..\..\packages\Noobot.Core.2.0.18\lib\net461\Noobot.Core.dll
+
+ ..\..\packages\Noobot.Core.3.0.0\lib\net461\Noobot.Core.dll
..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll
-
- ..\..\packages\SlackConnector.3.1.236\lib\net461\SlackConnector.dll
+
+ ..\..\packages\SlackConnector.4.0.0\lib\net461\SlackConnector.dll
+
+
+ ..\..\packages\SocketLite.PCL.4.0.6\lib\net45\SocketLite.dll
..\..\packages\StructureMap.4.5.1\lib\net45\StructureMap.dll
+
+ ..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll
+
+
+
+ ..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll
+
-
- ..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+ ..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+
+ ..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll
+
+
+ ..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
+
+
+
+ ..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll
-
- ..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll
+
+ ..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll
-
- ..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll
+
+ ..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll
-
- ..\..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll
+
+ ..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll
+
+
+ ..\..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll
+
+
+
+ ..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll
+
+
+ ..\..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll
+
+
+ ..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll
+
+
+ ..\..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll
+
+
+ ..\..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll
- ..\..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll
+ ..\..\packages\System.Reflection.TypeExtensions.4.3.0\lib\net46\System.Reflection.TypeExtensions.dll
+
+
+ ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
- ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll
+ ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll
-
- ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll
+
+ ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll
-
- ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll
+
+ ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll
-
- ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
+
+ ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
-
- ..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll
+
+ ..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll
+
-
- ..\..\packages\websocket-sharp-with-proxy-support.1.9.1\lib\net35-client\websocket-sharp-with-proxy-support.dll
+
+ ..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll
+
+
+ ..\..\packages\WebsocketClientLite.PCL.4.0.6\lib\netstandard1.2\WebsocketClientLite.PCL.dll
+
diff --git a/src/Noobot.Toolbox.Tests.Unit/app.config b/src/Noobot.Toolbox.Tests.Unit/app.config
index 7b04441..3a644ab 100644
--- a/src/Noobot.Toolbox.Tests.Unit/app.config
+++ b/src/Noobot.Toolbox.Tests.Unit/app.config
@@ -16,7 +16,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Noobot.Toolbox.Tests.Unit/packages.config b/src/Noobot.Toolbox.Tests.Unit/packages.config
index 0b4e05c..e9d9867 100644
--- a/src/Noobot.Toolbox.Tests.Unit/packages.config
+++ b/src/Noobot.Toolbox.Tests.Unit/packages.config
@@ -3,25 +3,68 @@
-
-
+
+
+
+
+
-
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Noobot.Toolbox/App.config b/src/Noobot.Toolbox/App.config
index fd08c75..57b1694 100644
--- a/src/Noobot.Toolbox/App.config
+++ b/src/Noobot.Toolbox/App.config
@@ -19,7 +19,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Noobot.Toolbox/Middleware/FlickrMiddleware.cs b/src/Noobot.Toolbox/Middleware/FlickrMiddleware.cs
index 1df0d76..fa76ca0 100644
--- a/src/Noobot.Toolbox/Middleware/FlickrMiddleware.cs
+++ b/src/Noobot.Toolbox/Middleware/FlickrMiddleware.cs
@@ -28,8 +28,8 @@ public FlickrMiddleware(IMiddleware next, IConfigReader configReader, StatsPlugi
{
new HandlerMapping
{
- ValidHandles = ExactMatchHandle.For( "flickr", "pic"),
- Description = "Finds a pics from flickr - usage: /flickr birds",
+ ValidHandles = StartsWithHandle.For("flickr", "pic"),
+ Description = "Finds a pics from flickr - usage: @{bot} flickr birds",
EvaluatorFunc = FlickrHandler,
}
};
diff --git a/src/Noobot.Toolbox/Noobot.Toolbox.csproj b/src/Noobot.Toolbox/Noobot.Toolbox.csproj
index 33044ae..be567fb 100644
--- a/src/Noobot.Toolbox/Noobot.Toolbox.csproj
+++ b/src/Noobot.Toolbox/Noobot.Toolbox.csproj
@@ -49,67 +49,123 @@
..\..\packages\Flurl.2.3.0\lib\netstandard1.4\Flurl.dll
-
- ..\..\packages\Flurl.Http.1.1.1\lib\net45\Flurl.Http.dll
+
+ ..\..\packages\Flurl.Http.1.1.2\lib\net45\Flurl.Http.dll
-
- ..\..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll
+
+ ..\..\packages\HttpMachine.PCL.3.0.1\lib\netstandard1\HttpMachine.dll
+
+
+ ..\..\packages\SocketLite.PCL.4.0.6\lib\net45\ISocketLite.PCL.dll
+
+
+ ..\..\packages\WebsocketClientLite.PCL.4.0.6\lib\netstandard1.2\IWebsocketClientLite.PCL.dll
+
+
+ ..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll
..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
-
- ..\..\packages\Noobot.Core.2.0.18\lib\net461\Noobot.Core.dll
+
+ ..\..\packages\Noobot.Core.3.0.0\lib\net461\Noobot.Core.dll
..\..\packages\Quartz.2.4.1\lib\net40\Quartz.dll
-
- ..\..\packages\SlackConnector.3.1.236\lib\net461\SlackConnector.dll
+
+ ..\..\packages\SlackConnector.4.0.0\lib\net461\SlackConnector.dll
+
+
+ ..\..\packages\SocketLite.PCL.4.0.6\lib\net45\SocketLite.dll
..\..\packages\StructureMap.4.5.1\lib\net45\StructureMap.dll
+
+ ..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll
+
+
+
+ ..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll
+
-
- ..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+ ..\..\packages\System.Diagnostics.DiagnosticSource.4.4.0\lib\net46\System.Diagnostics.DiagnosticSource.dll
+
+
+ ..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll
+
+
+ ..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
+
+
+
+ ..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll
-
- ..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll
+
+ ..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll
-
- ..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll
+
+ ..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll
-
- ..\..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll
+
+ ..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll
+
+
+ ..\..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll
+
+
+
+ ..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll
+
+
+ ..\..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll
+
+
+ ..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll
+
+
+ ..\..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll
+
+
+ ..\..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll
- ..\..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll
+ ..\..\packages\System.Reflection.TypeExtensions.4.3.0\lib\net46\System.Reflection.TypeExtensions.dll
+
+
+ ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
- ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll
+ ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll
-
- ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll
+
+ ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll
-
- ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll
+
+ ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll
-
- ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
+
+ ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll
-
- ..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll
+
+ ..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll
+
-
- ..\..\packages\websocket-sharp-with-proxy-support.1.9.1\lib\net35-client\websocket-sharp-with-proxy-support.dll
+
+ ..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll
+
+
+ ..\..\packages\WebsocketClientLite.PCL.4.0.6\lib\netstandard1.2\WebsocketClientLite.PCL.dll
+
..\..\packages\xFunc.Maths.2.15.16\lib\net451\xFunc.Maths.dll
diff --git a/src/Noobot.Toolbox/packages.config b/src/Noobot.Toolbox/packages.config
index 4abcc66..67b44f2 100644
--- a/src/Noobot.Toolbox/packages.config
+++ b/src/Noobot.Toolbox/packages.config
@@ -4,26 +4,69 @@
-
-
+
+
+
+
+
-
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file