diff --git a/Plugins/Wox.Plugin.Calculator/Languages/de.xaml b/Plugins/Wox.Plugin.Calculator/Languages/de.xaml
index 1f550de84..f5f1b27b5 100644
--- a/Plugins/Wox.Plugin.Calculator/Languages/de.xaml
+++ b/Plugins/Wox.Plugin.Calculator/Languages/de.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
@@ -7,6 +7,8 @@
     <system:String x:Key="wox_plugin_calculator_not_a_number">Keine Zahl (NaN)</system:String>
     <system:String x:Key="wox_plugin_calculator_expression_not_complete">Ausdruck falsch oder nicht vollständig (Klammern vergessen?)</system:String>
     <system:String x:Key="wox_plugin_calculator_copy_number_to_clipboard">Diese Zahl in die Zwischenablage kopieren</system:String>
+    <system:String x:Key="wox_plugin_calculator_output_decimal_seperator">Dezimaltrennzeichen</system:String>
+    <system:String x:Key="wox_plugin_calculator_output_decimal_seperator_help">Das Dezimaltrennzeichen, welches bei der Ausgabe verwendet werden soll.</system:String>
     <system:String x:Key="wox_plugin_calculator_decimal_seperator_use_system_locale">Systemeinstellung nutzen</system:String>
     <system:String x:Key="wox_plugin_calculator_decimal_seperator_comma">Komma (,)</system:String>
     <system:String x:Key="wox_plugin_calculator_decimal_seperator_dot">Punkt (.)</system:String>
diff --git a/Plugins/Wox.Plugin.Calculator/Languages/en.xaml b/Plugins/Wox.Plugin.Calculator/Languages/en.xaml
index 0de9225b3..e214919d1 100644
--- a/Plugins/Wox.Plugin.Calculator/Languages/en.xaml
+++ b/Plugins/Wox.Plugin.Calculator/Languages/en.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
@@ -7,6 +7,8 @@
     <system:String x:Key="wox_plugin_calculator_not_a_number">Not a number (NaN)</system:String>
     <system:String x:Key="wox_plugin_calculator_expression_not_complete">Expression wrong or incomplete (Did you forget some parentheses?)</system:String>
     <system:String x:Key="wox_plugin_calculator_copy_number_to_clipboard">Copy this number to the clipboard</system:String>
+    <system:String x:Key="wox_plugin_calculator_output_decimal_seperator">Decimal separator</system:String>
+    <system:String x:Key="wox_plugin_calculator_output_decimal_seperator_help">The decimal separator to be used in the output.</system:String>
     <system:String x:Key="wox_plugin_calculator_decimal_seperator_use_system_locale">Use system locale</system:String>
     <system:String x:Key="wox_plugin_calculator_decimal_seperator_comma">Comma (,)</system:String>
     <system:String x:Key="wox_plugin_calculator_decimal_seperator_dot">Dot (.)</system:String>
diff --git a/Plugins/Wox.Plugin.Calculator/Settings.cs b/Plugins/Wox.Plugin.Calculator/Settings.cs
new file mode 100644
index 000000000..a45405b29
--- /dev/null
+++ b/Plugins/Wox.Plugin.Calculator/Settings.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Wox.Plugin.Caculator
+{
+    public class Settings
+    {
+        public DecimalSeparator DecimalSeparator { get; set; } = DecimalSeparator.UseSystemLocale;
+    }
+}
diff --git a/Plugins/Wox.Plugin.Calculator/ViewModels/SettingsViewModel.cs b/Plugins/Wox.Plugin.Calculator/ViewModels/SettingsViewModel.cs
new file mode 100644
index 000000000..e06ad675c
--- /dev/null
+++ b/Plugins/Wox.Plugin.Calculator/ViewModels/SettingsViewModel.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Wox.Infrastructure.Storage;
+using Wox.Infrastructure.UserSettings;
+
+namespace Wox.Plugin.Caculator.ViewModels
+{
+    public class SettingsViewModel : BaseModel, ISavable
+    {
+        private readonly PluginJsonStorage<Settings> _storage;
+
+        public SettingsViewModel()
+        {
+            _storage = new PluginJsonStorage<Settings>();
+            Settings = _storage.Load();
+        }
+
+        public Settings Settings { get; set; }
+
+        public void Save()
+        {
+            _storage.Save();
+        }
+    }
+}
diff --git a/Plugins/Wox.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Wox.Plugin.Calculator/Views/CalculatorSettings.xaml
new file mode 100644
index 000000000..b9404710d
--- /dev/null
+++ b/Plugins/Wox.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -0,0 +1,44 @@
+<UserControl x:Class="Wox.Plugin.Caculator.Views.CalculatorSettings"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Wox.Plugin.Caculator.Views"
+             xmlns:infrastructure="clr-namespace:Wox.Infrastructure;assembly=Wox.Infrastructure"
+             xmlns:ui="clr-namespace:Wox.Infrastructure.UI;assembly=Wox.Infrastructure"
+             xmlns:calculator="clr-namespace:Wox.Plugin.Caculator"
+             xmlns:core="clr-namespace:Wox.Core;assembly=Wox.Core"
+             mc:Ignorable="d"
+             Loaded="CalculatorSettings_Loaded"
+             d:DesignHeight="450" d:DesignWidth="800">
+
+    <UserControl.Resources>
+        <core:LocalizationConverter x:Key="LocalizationConverter"/>
+    </UserControl.Resources>
+
+    <Border BorderBrush="Gray" Margin="10" BorderThickness="1">
+        <Grid Margin="10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="25"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="3*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Grid.Column="0" Text ="Decimal separator" VerticalAlignment="Center" /> <!-- Text="{DynamicResource wox_plugin_calculator_output_decimal_seperator}" />-->
+            <ComboBox Grid.Column="1"
+                x:Name="DecimalSeparatorComboBox" 
+                Width="200"
+                HorizontalAlignment="Left"
+                SelectedItem="{Binding Settings.DecimalSeparator}"
+                ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type calculator:DecimalSeparator}}}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Converter={StaticResource LocalizationConverter}}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/Plugins/Wox.Plugin.Calculator/Views/CalculatorSettings.xaml.cs b/Plugins/Wox.Plugin.Calculator/Views/CalculatorSettings.xaml.cs
new file mode 100644
index 000000000..c002243c5
--- /dev/null
+++ b/Plugins/Wox.Plugin.Calculator/Views/CalculatorSettings.xaml.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Wox.Plugin.Caculator.ViewModels;
+
+namespace Wox.Plugin.Caculator.Views
+{
+    /// <summary>
+    /// Interaction logic for CalculatorSettings.xaml
+    /// </summary>
+    public partial class CalculatorSettings : UserControl
+    {
+        private SettingsViewModel _viewModel;
+        private Settings _settings;
+
+        public CalculatorSettings(SettingsViewModel viewModel)
+        {
+            _viewModel = viewModel;
+            _settings = viewModel.Settings;
+            DataContext = viewModel;
+            InitializeComponent();
+        }
+
+        private void CalculatorSettings_Loaded(object sender, RoutedEventArgs e)
+        {
+            DecimalSeparatorComboBox.SelectedItem = _settings.DecimalSeparator;
+        }
+    }
+
+    
+}
diff --git a/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj b/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj
index a257caed6..4f7590273 100644
--- a/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj
+++ b/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -57,6 +57,11 @@
     <Compile Include="NumberTranslator.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Settings.cs" />
+    <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="Views\CalculatorSettings.xaml.cs">
+      <DependentUpon>CalculatorSettings.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -65,6 +70,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Wox.Core\Wox.Core.csproj">
+      <Project>{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}</Project>
+      <Name>Wox.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj">
       <Project>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</Project>
       <Name>Wox.Infrastructure</Name>
@@ -121,6 +130,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\CalculatorSettings.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/Wox.Infrastructure/UI/EnumBindingSource.cs b/Wox.Infrastructure/UI/EnumBindingSource.cs
new file mode 100644
index 000000000..c23aacd81
--- /dev/null
+++ b/Wox.Infrastructure/UI/EnumBindingSource.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Windows.Markup;
+
+namespace Wox.Infrastructure.UI
+{
+    public class EnumBindingSourceExtension : MarkupExtension
+    {
+        private Type _enumType;
+        public Type EnumType
+        {
+            get { return _enumType; }
+            set
+            {
+                if (value != _enumType)
+                {
+                    if (value != null)
+                    {
+                        Type enumType = Nullable.GetUnderlyingType(value) ?? value;
+                        if (!enumType.IsEnum)
+                        {
+                            throw new ArgumentException("Type must represent an enum.");
+                        }
+                    }
+
+                    _enumType = value;
+                }
+            }
+        }
+
+        public EnumBindingSourceExtension() { }
+
+        public EnumBindingSourceExtension(Type enumType)
+        {
+            EnumType = enumType;
+        }
+
+        public override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            if (_enumType == null)
+            { 
+                throw new InvalidOperationException("The EnumType must be specified.");
+            }
+
+            Type actualEnumType = Nullable.GetUnderlyingType(_enumType) ?? _enumType;
+            Array enumValues = Enum.GetValues(actualEnumType);
+
+            if (actualEnumType == _enumType)
+            {
+                return enumValues;
+            }
+
+            Array tempArray = Array.CreateInstance(actualEnumType, enumValues.Length + 1);
+            enumValues.CopyTo(tempArray, 1);
+            return tempArray;
+        }
+    }
+}
diff --git a/Wox.Infrastructure/Wox.Infrastructure.csproj b/Wox.Infrastructure/Wox.Infrastructure.csproj
index af76894ed..ab8976fb8 100644
--- a/Wox.Infrastructure/Wox.Infrastructure.csproj
+++ b/Wox.Infrastructure/Wox.Infrastructure.csproj
@@ -87,6 +87,7 @@
     <Compile Include="Hotkey\HotkeyModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Alphabet.cs" />
+    <Compile Include="UI\EnumBindingSource.cs" />
     <Compile Include="UserSettings\HttpProxy.cs" />
     <Compile Include="UserSettings\PluginHotkey.cs" />
     <Compile Include="UserSettings\PluginSettings.cs" />