diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..1878f561b1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,33 @@
+> ℹ Please fill out this template when filing an issue.
+> All lines beginning with an ℹ symbol instruct you with what info we expect. You can delete those lines once you've filled in the info.
+>
+> Per our [*CONTRIBUTING guidelines](https://github.com/jjatie/Charts/blob/master/CONTRIBUTING.md), we use GitHub for
+> bugs and feature requests, not general support. Other issues should be opened on Stack Overflow with the tag [`ios-charts`.](https://stackoverflow.com/questions/tagged/ios-charts)
+>
+> Please remove this line and everything above it before submitting.
+
+* [ ] I've read, understood, and done my best to follow the [*CONTRIBUTING guidelines](https://github.com/jjatie/Charts/blob/master/CONTRIBUTING.md).
+
+## What did you do?
+
+ℹ Please replace this with what you did.  
+
+## What did you expect to happen?
+
+ℹ Please replace this with what you expected to happen.  
+
+## What happened instead?
+
+ℹ Please replace this with of what happened instead.  
+
+## Charts Environment
+
+**Charts version/Branch/Commit Number:**
+**Xcode version:**
+**Swift version:**
+**Platform(s) running Charts:**
+**macOS version running Xcode:**
+
+## Demo Project
+
+ℹ Please link to or upload a project we can download that reproduces the issue.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..30eee84561
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+### Issue Link :link:
+<!-- What issue does this fix? If an issue doesn't exist, remove this section. -->
+
+### Goals :soccer:
+<!-- List the high-level objectives of this pull request. -->
+<!-- Include any relevant context. -->
+
+### Implementation Details :construction:
+<!-- Explain the reasoning behind any architectural changes. -->
+<!-- Highlight any new functionality. -->
+
+### Testing Details :mag:
+<!-- Describe what tests you've added for your changes. -->
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8ba8e0ead7..c49c6a1c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ fastlane/test_output
 Carthage
 Charts.framework.zip
 ChartsRealm.framework.zip
+.swiftpm/
diff --git a/.travis.yml b/.travis.yml
index 3f56fe5082..70a7ecaee0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,25 @@
-osx_image: xcode8.3
 language: objective-c
-rvm:
-- 2.2
+osx_image: xcode11
+matrix:
+  include:
+    - osx_image: xcode11
+      env: PLATFORM="iOS"
+    - osx_image: xcode11
+      env: PLATFORM="tvOS"
+    - osx_image: xcode11
+      env: PLATFORM="macOS"
 env:
   global:
-  - LANG=en_US.UTF-8
-  - secure: HRl5Cg3/LmTJYCSDGtV8Fiqf6OgWXR6C5YkNviOElU9YmcCTvnmE7MCm+gK8hJNIQ2mWCBTlxTC7jJxeYlx0D+JQ6IhRc75B4zXgbtth6HCzlvhWDcBbNU/K+JPDjy2EAoVgvf8Xseq6GqM4WcVg2Pwr9PS3aaH/SKDE6yVoPXRM2wXRAxIdxayqm/RQgG88jAKgg+Ub5DKW/c9NLLbUf/WdY9SgQDJtqeZCMv7G3/IzW34KZgVPsqSrPByzZXbf7KgYkYLQlscH4mcUctk1qxhdCae//zcgUZo/utpXWbPXQqtvDpuqrg9IRvoGxa/D1I7dLSJsVnk4aP7RW18vn4HJ82C2AiEp+lU2TQE9y5lXcGssZVIa5aZNTWL90HVer3Kg6AnHffvdCSZ/UHsMZJFURUXL9fRIlWVGuEDeQOqlV6lUmEtp/BiEdV4D5PuCyT6snsmEwkc51goyqh6uS6XhJyqYEQdxdoybznwp91tVmASsRybppIGHTkcWN5csF4zQt40tEwd8LoqM+bBUo0wxKiKsNsecL4JA+YDYs2saZY9U3s8jAaIon+qDu071fPRaPEvBhYHYDhy4cTvBXibyGUYGHkrgLu0w19wDfHcJKt2In58yOmaCCLNoTGp/ZLNVRyZ8VDlj/NdJ2dWpMsL2Aj7OxU065kCL2FlvuRU=
-  matrix:
-  - PLATFORM="iOS"
-  - PLATFORM="tvOS"
-  - PLATFORM="macOS"
+    - LANG=en_US.UTF-8
+    - secure: HRl5Cg3/LmTJYCSDGtV8Fiqf6OgWXR6C5YkNviOElU9YmcCTvnmE7MCm+gK8hJNIQ2mWCBTlxTC7jJxeYlx0D+JQ6IhRc75B4zXgbtth6HCzlvhWDcBbNU/K+JPDjy2EAoVgvf8Xseq6GqM4WcVg2Pwr9PS3aaH/SKDE6yVoPXRM2wXRAxIdxayqm/RQgG88jAKgg+Ub5DKW/c9NLLbUf/WdY9SgQDJtqeZCMv7G3/IzW34KZgVPsqSrPByzZXbf7KgYkYLQlscH4mcUctk1qxhdCae//zcgUZo/utpXWbPXQqtvDpuqrg9IRvoGxa/D1I7dLSJsVnk4aP7RW18vn4HJ82C2AiEp+lU2TQE9y5lXcGssZVIa5aZNTWL90HVer3Kg6AnHffvdCSZ/UHsMZJFURUXL9fRIlWVGuEDeQOqlV6lUmEtp/BiEdV4D5PuCyT6snsmEwkc51goyqh6uS6XhJyqYEQdxdoybznwp91tVmASsRybppIGHTkcWN5csF4zQt40tEwd8LoqM+bBUo0wxKiKsNsecL4JA+YDYs2saZY9U3s8jAaIon+qDu071fPRaPEvBhYHYDhy4cTvBXibyGUYGHkrgLu0w19wDfHcJKt2In58yOmaCCLNoTGp/ZLNVRyZ8VDlj/NdJ2dWpMsL2Aj7OxU065kCL2FlvuRU=
 cache:
-- bundler
+  - bundler
 before_install:
-- brew update
-- brew upgrade carthage || true
-- carthage version
-- carthage bootstrap --platform $PLATFORM
+  - brew update
+  - brew upgrade carthage || true
+  - carthage version
+  - carthage bootstrap --platform $PLATFORM
 script:
-- bundle exec rake ci[$PLATFORM]
+  - bundle exec rake ci[$PLATFORM]
 after_success:
-- bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f93ca2443c..4cbb87b8c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,1921 @@
 # Change Log
 
-## [v3.0.1](https://github.com/danielgindi/charts/tree/v3.0.1) (2016-11-20)
+## [v3.4.0](https://github.com/danielgindi/Charts/tree/v3.4.0) (2019-10-09)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.3.0...v3.4.0)
 
-[Full Changelog](https://github.com/danielgindi/charts/compare/v3.0.1...v3.0.0)
+**Fixed bugs:**
+
+- Line charts: Line sections disappear when zoomed in \(has PR\). [\#4099](https://github.com/danielgindi/Charts/issues/4099)
+- Line chart x axis animation is broken [\#4093](https://github.com/danielgindi/Charts/issues/4093)
+- LineChartView.highlightValue causes CoreGraphics API errors [\#4043](https://github.com/danielgindi/Charts/issues/4043)
+- Horizontal Bezier Line Graph Not Drawing Through All Points [\#3960](https://github.com/danielgindi/Charts/issues/3960)
+- Index out of bounds exception in v3.2 in createAccessibleElement [\#3659](https://github.com/danielgindi/Charts/issues/3659)
+
+**Closed issues:**
+
+- Xcode asking for constants instead of variables in Charts code [\#4161](https://github.com/danielgindi/Charts/issues/4161)
+- Blank space should not exist in BarChartView [\#4157](https://github.com/danielgindi/Charts/issues/4157)
+- Could not find module 'Charts' for target 'arm64-apple-ios'; found: x86\_64-apple-ios-simulator, x86\_64 [\#4154](https://github.com/danielgindi/Charts/issues/4154)
+- 指定哪个swift版本都报语法错误 [\#4145](https://github.com/danielgindi/Charts/issues/4145)
+- lineChart  customize the color or style of the selected point [\#4144](https://github.com/danielgindi/Charts/issues/4144)
+-   How do I customize the color or style of the selected point in a polygraph [\#4143](https://github.com/danielgindi/Charts/issues/4143)
+- Help, How to achieve this style? [\#4138](https://github.com/danielgindi/Charts/issues/4138)
+- AutoScaleMinMax doesn't work in candlestick iOS [\#4135](https://github.com/danielgindi/Charts/issues/4135)
+- 怎么手动设定滚动到指定x坐标 [\#4130](https://github.com/danielgindi/Charts/issues/4130)
+- The reuse of charts on tableviewcell [\#4127](https://github.com/danielgindi/Charts/issues/4127)
+- LineChartView decrease height if add many LineChartDataSets [\#4122](https://github.com/danielgindi/Charts/issues/4122)
+- 堆叠柱状图不同数据之间的间距 [\#4120](https://github.com/danielgindi/Charts/issues/4120)
+- Removing LineChartView to save memory? [\#4114](https://github.com/danielgindi/Charts/issues/4114)
+- h [\#4110](https://github.com/danielgindi/Charts/issues/4110)
+- swift 5 [\#4107](https://github.com/danielgindi/Charts/issues/4107)
+- Scatter charts dots needs to be shown even it is less than half [\#4096](https://github.com/danielgindi/Charts/issues/4096)
+- barchart 1st bar offset [\#4092](https://github.com/danielgindi/Charts/issues/4092)
+- Compiling Chart with Swift 5.1 raises compilation error [\#4090](https://github.com/danielgindi/Charts/issues/4090)
+- How to change color for Key's Label ? [\#4088](https://github.com/danielgindi/Charts/issues/4088)
+- y axis  [\#4087](https://github.com/danielgindi/Charts/issues/4087)
+- No chart data available \(displaying large data sets\) [\#4075](https://github.com/danielgindi/Charts/issues/4075)
+- 3.2.2 xBounds starts from 1 [\#4073](https://github.com/danielgindi/Charts/issues/4073)
+- Build error on Xcode 11 beta 3 - macOS app [\#4071](https://github.com/danielgindi/Charts/issues/4071)
+- Why not fix \#3865 in swift4.2 as well? [\#4067](https://github.com/danielgindi/Charts/issues/4067)
+- Pod install failed - Could not found branch v3.3 issue [\#4063](https://github.com/danielgindi/Charts/issues/4063)
+- Potential bug highlighting Bars in Bar chart  [\#4062](https://github.com/danielgindi/Charts/issues/4062)
+- PieChart slices with different height/thick [\#4061](https://github.com/danielgindi/Charts/issues/4061)
+- Line Chart crashes when upgrading from 3.2.1 to 3.2.2 or greater [\#4060](https://github.com/danielgindi/Charts/issues/4060)
+- How to set the shadow width? [\#4058](https://github.com/danielgindi/Charts/issues/4058)
+- iOS13 port [\#4056](https://github.com/danielgindi/Charts/issues/4056)
+- Embedding in Objective C++ project [\#4054](https://github.com/danielgindi/Charts/issues/4054)
+- Example project does not work for latest swift  [\#4053](https://github.com/danielgindi/Charts/issues/4053)
+- Line chart line color array issue [\#4052](https://github.com/danielgindi/Charts/issues/4052)
+- I set the display is double but turned into an integer [\#4051](https://github.com/danielgindi/Charts/issues/4051)
+- xAxis Renderer label [\#4039](https://github.com/danielgindi/Charts/issues/4039)
+- Highlight midPoint of visible area [\#4032](https://github.com/danielgindi/Charts/issues/4032)
+- Snap to position for x values \(paging\) [\#4030](https://github.com/danielgindi/Charts/issues/4030)
+- how can I use both chart in one view like video? [\#4026](https://github.com/danielgindi/Charts/issues/4026)
+- How to Parse xValue and yValue to LineChartData ? [\#4025](https://github.com/danielgindi/Charts/issues/4025)
+- Fatal error: Index out of range from subscript\(position: Index\) -\> Element [\#4024](https://github.com/danielgindi/Charts/issues/4024)
+- Pie chart label  [\#4022](https://github.com/danielgindi/Charts/issues/4022)
+- Cannot find "@import Charts;" in -Swift.h, I can only @import Charts in OC files, anything I missed? [\#4021](https://github.com/danielgindi/Charts/issues/4021)
+- Cannot subclass LineChartRenderer with Clang 11 [\#4018](https://github.com/danielgindi/Charts/issues/4018)
+- Unable to compile with Swift Package Manager due to missing dependencies [\#4016](https://github.com/danielgindi/Charts/issues/4016)
+- Show values in marker when you click a circle in LineChart [\#4015](https://github.com/danielgindi/Charts/issues/4015)
+- Is it possible to show only part of series on full XAxis labels? [\#4014](https://github.com/danielgindi/Charts/issues/4014)
+- BarChartRenderer FatalError: Index out of range [\#4013](https://github.com/danielgindi/Charts/issues/4013)
+- how to set max zoom scale for y-axis [\#4011](https://github.com/danielgindi/Charts/issues/4011)
+- ScatterChartDataSet basic initializer causes crashes [\#4010](https://github.com/danielgindi/Charts/issues/4010)
+- oc project could't use [\#4008](https://github.com/danielgindi/Charts/issues/4008)
+- Line chart issue [\#4005](https://github.com/danielgindi/Charts/issues/4005)
+- Crash on PieChartRenderer line 833 [\#4001](https://github.com/danielgindi/Charts/issues/4001)
+- BarChartView shows on UI when y value is zero [\#4000](https://github.com/danielgindi/Charts/issues/4000)
+- can make excel [\#3999](https://github.com/danielgindi/Charts/issues/3999)
+- Cannot remove an observer for the key path "bounds" because it is not registered as an observer [\#3995](https://github.com/danielgindi/Charts/issues/3995)
+- How to set y axis value with larger difference because my candles are showing very small in size please provide any way  [\#3993](https://github.com/danielgindi/Charts/issues/3993)
+- compiling for iOS 8.0, but module 'Charts' has a minimum deployment target of iOS 8.4: [\#3992](https://github.com/danielgindi/Charts/issues/3992)
+- SIGABRT [\#3986](https://github.com/danielgindi/Charts/issues/3986)
+- Getting The below error on Xcode update: Error Group :-1: Undefined symbol: \_OBJC\_CLASS\_$\_XBarChart :-1: Undefined symbol: \_OBJC\_CLASS\_$\_XBarChartConfiguration :-1: Undefined symbol: \_OBJC\_CLASS\_$\_XBarItem, When I run on real device. [\#3985](https://github.com/danielgindi/Charts/issues/3985)
+- Second to last value in stacked BarChart not drawn when the last value is zero [\#3984](https://github.com/danielgindi/Charts/issues/3984)
+- Value labels are not always showing in horizontal bar chart [\#3981](https://github.com/danielgindi/Charts/issues/3981)
+- When I manually integrated "charts", running the iOS9.0 emulator crashed. [\#3980](https://github.com/danielgindi/Charts/issues/3980)
+- LineChartDataSet function setColors is unavailable? [\#3979](https://github.com/danielgindi/Charts/issues/3979)
+- notifyDataSetChanged\(\) crashes with CGAffineTransformInvert: singular matrix. [\#3978](https://github.com/danielgindi/Charts/issues/3978)
+- this version is 3.2.2 in pods, this version has problem [\#3977](https://github.com/danielgindi/Charts/issues/3977)
+- Undefined symbol: method descriptor for Charts.ChartViewBase.initialize\(\) -\> \(\) [\#3976](https://github.com/danielgindi/Charts/issues/3976)
+- PieChart highlightEnabled flag operation is reverse of setting [\#3975](https://github.com/danielgindi/Charts/issues/3975)
+- I am not getting the last value  of x axis in the group chart [\#3974](https://github.com/danielgindi/Charts/issues/3974)
+- Charts 3.3.0 not running on Xcode 10.2 [\#3972](https://github.com/danielgindi/Charts/issues/3972)
+- change line chart legend text color [\#3971](https://github.com/danielgindi/Charts/issues/3971)
+- drawCenterTextEnable [\#3969](https://github.com/danielgindi/Charts/issues/3969)
+- Installing version 3.3  from Pods not found [\#3968](https://github.com/danielgindi/Charts/issues/3968)
+- zero value in bar chart [\#3967](https://github.com/danielgindi/Charts/issues/3967)
+- \[Question\] Line Chart Filled Circle Hole when highlighted [\#3966](https://github.com/danielgindi/Charts/issues/3966)
+- How to change pie chart boarder color and width size ? and separator line width size and curve? in swift 4 [\#3959](https://github.com/danielgindi/Charts/issues/3959)
+- Charts Pagination [\#3957](https://github.com/danielgindi/Charts/issues/3957)
+- button press [\#3956](https://github.com/danielgindi/Charts/issues/3956)
+- Edit leading Trailing and width of bar [\#3954](https://github.com/danielgindi/Charts/issues/3954)
+- Can't suspend the ongoing drag  [\#3953](https://github.com/danielgindi/Charts/issues/3953)
+- incorrect display in LineChartView When all yAxis data being 0 [\#3950](https://github.com/danielgindi/Charts/issues/3950)
+- Balloon Marker Swift errors [\#3947](https://github.com/danielgindi/Charts/issues/3947)
+- Linhas de sobreposição PieChart  [\#3942](https://github.com/danielgindi/Charts/issues/3942)
+- Display Attributed String on X-Axis [\#3941](https://github.com/danielgindi/Charts/issues/3941)
+- getHighlightByTouchPoint will get nil [\#3940](https://github.com/danielgindi/Charts/issues/3940)
+- Fatal error: removeEntry is not implemented in ChartBaseDataSet: [\#3937](https://github.com/danielgindi/Charts/issues/3937)
+- Line graph points create lines to other points [\#3936](https://github.com/danielgindi/Charts/issues/3936)
+- CombinedChart and data [\#3930](https://github.com/danielgindi/Charts/issues/3930)
+- Gradient and round corner in bar chart [\#3928](https://github.com/danielgindi/Charts/issues/3928)
+- Slide space color pie-chart  [\#3926](https://github.com/danielgindi/Charts/issues/3926)
+- Cannot build enterprise with Charts [\#3924](https://github.com/danielgindi/Charts/issues/3924)
+- ChartUtils.swift line 225 [\#3922](https://github.com/danielgindi/Charts/issues/3922)
+- Not Drawing Chart With Exact Axis [\#3921](https://github.com/danielgindi/Charts/issues/3921)
+- LineChartView with a line that goes backwards [\#3919](https://github.com/danielgindi/Charts/issues/3919)
+- Remove slices text in pieChart [\#3918](https://github.com/danielgindi/Charts/issues/3918)
+- Crash at BarChartDataSet as! IBarChartDataSet [\#3917](https://github.com/danielgindi/Charts/issues/3917)
+- carthage support lagging - needs updating for Xcode 10.2 & Swift5 [\#3914](https://github.com/danielgindi/Charts/issues/3914)
+- The first dot doesn't show up when I use lineChart [\#3912](https://github.com/danielgindi/Charts/issues/3912)
+- How to listen to the end of a chart swipe to call a method [\#3911](https://github.com/danielgindi/Charts/issues/3911)
+- How to display single data when using LineChartView [\#3910](https://github.com/danielgindi/Charts/issues/3910)
+- Straight Line in third quadrant does't show up [\#3898](https://github.com/danielgindi/Charts/issues/3898)
+- Horizontal scrolling in long vertical tableView causes the outer table to jump [\#3866](https://github.com/danielgindi/Charts/issues/3866)
+- PieChart with value lines with very small values render values on top of each other [\#3613](https://github.com/danielgindi/Charts/issues/3613)
+- Line Chart do not draw line for Data Set [\#2567](https://github.com/danielgindi/Charts/issues/2567)
+- Stacked bar marker returns entry.y of entire stack [\#2173](https://github.com/danielgindi/Charts/issues/2173)
+- Repeating Xaxis values [\#2143](https://github.com/danielgindi/Charts/issues/2143)
+
+**Merged pull requests:**
+
+- Apply Xcode11 changes [\#4153](https://github.com/danielgindi/Charts/pull/4153) ([liuxuan30](https://github.com/liuxuan30))
+- Fixes \#4099: Line renderer did not render lines if their coordinates fell outside of the viewport. [\#4100](https://github.com/danielgindi/Charts/pull/4100) ([4np](https://github.com/4np))
+- Fix line chart x axis animation \#4093, also close \#3960 [\#4094](https://github.com/danielgindi/Charts/pull/4094) ([liuxuan30](https://github.com/liuxuan30))
+- Update License [\#4055](https://github.com/danielgindi/Charts/pull/4055) ([jobinsjohn](https://github.com/jobinsjohn))
+- fixed stacked chart bug when there are different stacks on columns. [\#4029](https://github.com/danielgindi/Charts/pull/4029) ([Scalman](https://github.com/Scalman))
+- Fix Swift Package Manager compile issue [\#4017](https://github.com/danielgindi/Charts/pull/4017) ([rynecheow](https://github.com/rynecheow))
+- Added a safety check before an unsafe array operation [\#4006](https://github.com/danielgindi/Charts/pull/4006) ([UberNick](https://github.com/UberNick))
+- fix \#3975 \(pie chart highlight disabled will lead to empty slice\) [\#3996](https://github.com/danielgindi/Charts/pull/3996) ([liuxuan30](https://github.com/liuxuan30))
+- For \#3917. make init\(label: String?\) convenient initializer [\#3973](https://github.com/danielgindi/Charts/pull/3973) ([liuxuan30](https://github.com/liuxuan30))
+- Avoid passing NaN to CoreGraphics API \(Fixes \#1626\) [\#2568](https://github.com/danielgindi/Charts/pull/2568) ([chiahan1123](https://github.com/chiahan1123))
+
+## [v3.3.0](https://github.com/danielgindi/Charts/tree/v3.3.0) (2019-04-24)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.2.2...v3.3.0)
+
+**Implemented enhancements:**
+
+- Provide pre-compiled universal binary [\#3867](https://github.com/danielgindi/Charts/issues/3867)
+- Renamed `values` to `entries` to reflect the property's type [\#3847](https://github.com/danielgindi/Charts/pull/3847) ([jjatie](https://github.com/jjatie))
+
+**Fixed bugs:**
+
+- Pie chart with vertical orientation clips last legend entry [\#3860](https://github.com/danielgindi/Charts/issues/3860)
+
+**Closed issues:**
+
+- 雷达图的拐点是怎么设置的 [\#3964](https://github.com/danielgindi/Charts/issues/3964)
+- BarChartView没有从0开始 [\#3963](https://github.com/danielgindi/Charts/issues/3963)
+- version 3.3 using spm results invalid string error [\#3962](https://github.com/danielgindi/Charts/issues/3962)
+- 折线图能分页吗 就是滑动到最左边 网络请求再加载数据 [\#3961](https://github.com/danielgindi/Charts/issues/3961)
+- BarChartView problem on dataset count changed [\#3958](https://github.com/danielgindi/Charts/issues/3958)
+- No Such Module 'Charts' [\#3955](https://github.com/danielgindi/Charts/issues/3955)
+- drawing asynchronous [\#3952](https://github.com/danielgindi/Charts/issues/3952)
+- demo can not run [\#3951](https://github.com/danielgindi/Charts/issues/3951)
+- BarChartView extends all bars to bottom when all values are negative [\#3949](https://github.com/danielgindi/Charts/issues/3949)
+- xcode10.2,swift5,chart version 3.3.0 [\#3948](https://github.com/danielgindi/Charts/issues/3948)
+- Compiling for iOS 8.1, but module 'Charts' has a minimum deployment target of iOS 8.4 [\#3946](https://github.com/danielgindi/Charts/issues/3946)
+- X轴的Label显示间隔会随着值的增加而变大, 能控制显示间隔吗? [\#3943](https://github.com/danielgindi/Charts/issues/3943)
+-  the first point of LineChartView is not displayed, and so is demo [\#3938](https://github.com/danielgindi/Charts/issues/3938)
+- why？？？？？ [\#3934](https://github.com/danielgindi/Charts/issues/3934)
+- The “Swift Language Version” \(SWIFT\_VERSION\) build setting must be set to a supported value for targets which use Swift. Supported values are: 4.0, 4.2, 5.0. This setting can be set in the build settings editor. [\#3932](https://github.com/danielgindi/Charts/issues/3932)
+- error: SWIFT\_VERSION '3.0' is unsupported, supported versions are: 4.0, 4.2, 5.0. \(in target 'Charts'\) [\#3929](https://github.com/danielgindi/Charts/issues/3929)
+- 最新版更新后的问题 [\#3927](https://github.com/danielgindi/Charts/issues/3927)
+- How can i get CenterEntry in the View when i setted the MaxVisibleRange? [\#3925](https://github.com/danielgindi/Charts/issues/3925)
+- EXC\_BAD\_ACCESS error on PieChart [\#3923](https://github.com/danielgindi/Charts/issues/3923)
+- The first dot doesn't show up when I use lineChart [\#3915](https://github.com/danielgindi/Charts/issues/3915)
+- Swift 5 Support w/ Cocoapods [\#3913](https://github.com/danielgindi/Charts/issues/3913)
+- HOW to create pie chart like below image . https://user-images.githubusercontent.com/20434573/54804603-1d31fa80-4c9a-11e9-9960-00cf7c7d117d.png [\#3908](https://github.com/danielgindi/Charts/issues/3908)
+- x Axis grid line origin is wrong !  maybe  a bug,  anxious!!! [\#3904](https://github.com/danielgindi/Charts/issues/3904)
+- why not use CAShapeLayer? [\#3903](https://github.com/danielgindi/Charts/issues/3903)
+- Chart legend  [\#3896](https://github.com/danielgindi/Charts/issues/3896)
+- Wrong values from pixelForValues [\#3895](https://github.com/danielgindi/Charts/issues/3895)
+- Cannot set labels for RadarChart [\#3893](https://github.com/danielgindi/Charts/issues/3893)
+- I can't migrate the swift files\(combined chart\) in objective c project. Could please share the objective c code fully. Thanks in advance. [\#3890](https://github.com/danielgindi/Charts/issues/3890)
+- Draw circle only on last value [\#3887](https://github.com/danielgindi/Charts/issues/3887)
+- Mismatch left axis maximum and minimum values  [\#3886](https://github.com/danielgindi/Charts/issues/3886)
+- How to animate? start poisiton is not from zero. [\#3885](https://github.com/danielgindi/Charts/issues/3885)
+- I want to change line chart fill colours  [\#3882](https://github.com/danielgindi/Charts/issues/3882)
+- Circle view is not showing for first point of line chart [\#3881](https://github.com/danielgindi/Charts/issues/3881)
+- support ECG demo? [\#3880](https://github.com/danielgindi/Charts/issues/3880)
+- How to remove the values given outside the circle in piechart [\#3878](https://github.com/danielgindi/Charts/issues/3878)
+-  file was built for x86\_64 which is not the architecture being linked \(arm64\):error: linker command failed with exit code 1 \(use -v to see invocation\) [\#3877](https://github.com/danielgindi/Charts/issues/3877)
+- Clipping first and last circle from line chart IOS. [\#3873](https://github.com/danielgindi/Charts/issues/3873)
+- Smoothly moving a slowly changing linechart [\#3859](https://github.com/danielgindi/Charts/issues/3859)
+- Monthly X-Axis labels \(corresponding values\) in my LineChart are not at the right position [\#3858](https://github.com/danielgindi/Charts/issues/3858)
+- CandleChart do not render the first candle in CombineChartView [\#3857](https://github.com/danielgindi/Charts/issues/3857)
+- Have 2 or more tresholds for one graph [\#3856](https://github.com/danielgindi/Charts/issues/3856)
+- Unexpected crash on 3.2.2 [\#3855](https://github.com/danielgindi/Charts/issues/3855)
+- How to change the display of legends? [\#3853](https://github.com/danielgindi/Charts/issues/3853)
+- I want to call a method after the chart has been dragged and stopped. How can I detect it and the chart has stopped? [\#3851](https://github.com/danielgindi/Charts/issues/3851)
+- HorizontalBarChartView bar negative values position  [\#3850](https://github.com/danielgindi/Charts/issues/3850)
+- charts 有数据创建图表后，点击按钮将数据置为空则崩溃 [\#3849](https://github.com/danielgindi/Charts/issues/3849)
+- No circle is drawn on a line chart when there is only one data. \(version 3.2.2 only\) [\#3848](https://github.com/danielgindi/Charts/issues/3848)
+- slice color [\#3844](https://github.com/danielgindi/Charts/issues/3844)
+- BarChartView showing consecutive values in xAxis [\#3843](https://github.com/danielgindi/Charts/issues/3843)
+- How to hide those icons?  [\#3842](https://github.com/danielgindi/Charts/issues/3842)
+- Swift 4.2: 'values' is deprecated Warnings [\#3840](https://github.com/danielgindi/Charts/issues/3840)
+- Y-axis values draw error [\#3837](https://github.com/danielgindi/Charts/issues/3837)
+- Horizontal Bar Chart Value Labels Cut Off [\#3836](https://github.com/danielgindi/Charts/issues/3836)
+- The right Y axis displays incorrect values that does not fit the chart [\#3835](https://github.com/danielgindi/Charts/issues/3835)
+-  How to align labels on left side and put values inside bars on HorizontalBarChartView? \[HELP WANTED\] [\#3833](https://github.com/danielgindi/Charts/issues/3833)
+- How to show the tooltip like value when clicked on candle of candleStick chart [\#3832](https://github.com/danielgindi/Charts/issues/3832)
+- In line chart, can I make all labels in Chart area even with changing yOffset? [\#3829](https://github.com/danielgindi/Charts/issues/3829)
+- Multiline value labels on BarChart. [\#3826](https://github.com/danielgindi/Charts/issues/3826)
+- how can I spin the selected slice of piechart to top. [\#3825](https://github.com/danielgindi/Charts/issues/3825)
+- Update Cocoapods [\#3773](https://github.com/danielgindi/Charts/issues/3773)
+- Select circles on line chart [\#3307](https://github.com/danielgindi/Charts/issues/3307)
+
+**Merged pull requests:**
+
+- Fix horizontal bar chart not drawing values and add unit tests [\#3906](https://github.com/danielgindi/Charts/pull/3906) ([liuxuan30](https://github.com/liuxuan30))
+- fix \#3860. maxHeight didn't count the last label [\#3900](https://github.com/danielgindi/Charts/pull/3900) ([liuxuan30](https://github.com/liuxuan30))
+- Migrating to built-in algorithms [\#3892](https://github.com/danielgindi/Charts/pull/3892) ([jjatie](https://github.com/jjatie))
+- Use a stock iterator instead of a custom one. [\#3891](https://github.com/danielgindi/Charts/pull/3891) ([phughes](https://github.com/phughes))
+- Removed unnecessary \#if statements and unified style to align with Xc… [\#3884](https://github.com/danielgindi/Charts/pull/3884) ([jjatie](https://github.com/jjatie))
+- Velocity samples calculation [\#3883](https://github.com/danielgindi/Charts/pull/3883) ([jjatie](https://github.com/jjatie))
+- Minor updates for Swift 5 [\#3874](https://github.com/danielgindi/Charts/pull/3874) ([jjatie](https://github.com/jjatie))
+- Replace AnyObject with Any [\#3864](https://github.com/danielgindi/Charts/pull/3864) ([jjatie](https://github.com/jjatie))
+- Data as any [\#3863](https://github.com/danielgindi/Charts/pull/3863) ([jjatie](https://github.com/jjatie))
+- Reassess convenience initializers [\#3862](https://github.com/danielgindi/Charts/pull/3862) ([jjatie](https://github.com/jjatie))
+- HorizontalBarChar value label offset calculation  [\#3854](https://github.com/danielgindi/Charts/pull/3854) ([chaaarly](https://github.com/chaaarly))
+- Create `chartViewDidEndAnimate` in ChartViewDelegate [\#3852](https://github.com/danielgindi/Charts/pull/3852) ([Lcsmarcal](https://github.com/Lcsmarcal))
+- Align `ChartLimit.LabelPosition` naming with `UIRectCorner` [\#3846](https://github.com/danielgindi/Charts/pull/3846) ([jjatie](https://github.com/jjatie))
+
+## [v3.2.2](https://github.com/danielgindi/Charts/tree/v3.2.2) (2019-02-13)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.2.1...v3.2.2)
+
+**Implemented enhancements:**
+
+- 【PieChart】Please support multiple colors for valueline. [\#3480](https://github.com/danielgindi/Charts/issues/3480)
+
+**Fixed bugs:**
+
+- CombinedChartView's  candleData don't display in v3.2.0 [\#3662](https://github.com/danielgindi/Charts/issues/3662)
+- Incorrect behavior for AxisBase.axisMaxLabels [\#3656](https://github.com/danielgindi/Charts/issues/3656)
+- Horizontal Bar Chart legend issue [\#3301](https://github.com/danielgindi/Charts/issues/3301)
+
+**Closed issues:**
+
+- barchartview draw value in bottom of chart [\#3827](https://github.com/danielgindi/Charts/issues/3827)
+- Regarding to label of axis, I think it displays .03 instead of 0.03 [\#3824](https://github.com/danielgindi/Charts/issues/3824)
+- Bar Chart Not Showing Colours Correctly [\#3823](https://github.com/danielgindi/Charts/issues/3823)
+- Pie Chart on click show value on label. Does anyone know how to do it? [\#3822](https://github.com/danielgindi/Charts/issues/3822)
+- chartTranslated in a Pie Chart is not called [\#3821](https://github.com/danielgindi/Charts/issues/3821)
+- Issue creating a simple line chart [\#3820](https://github.com/danielgindi/Charts/issues/3820)
+- How to save image of scrollable graph [\#3819](https://github.com/danielgindi/Charts/issues/3819)
+- Candle charts not showing candles on swift 4.2 [\#3818](https://github.com/danielgindi/Charts/issues/3818)
+- How to get a value from line graph if there is more than one lines [\#3817](https://github.com/danielgindi/Charts/issues/3817)
+- Multiple colors for the same line [\#3816](https://github.com/danielgindi/Charts/issues/3816)
+- Memory Leaks in subclass of LineChartView [\#3813](https://github.com/danielgindi/Charts/issues/3813)
+- Distortion When Animating Height of Auto Layout `LineChartView` [\#3811](https://github.com/danielgindi/Charts/issues/3811)
+- How to show break in line chart for more than one graph? [\#3810](https://github.com/danielgindi/Charts/issues/3810)
+- PIE Chart Colors not properly set [\#3809](https://github.com/danielgindi/Charts/issues/3809)
+- A Question to contribution [\#3808](https://github.com/danielgindi/Charts/issues/3808)
+- When y value is equal ，HorizontalBarChartView only show integer [\#3806](https://github.com/danielgindi/Charts/issues/3806)
+- Highlight per drag not working! [\#3805](https://github.com/danielgindi/Charts/issues/3805)
+- chartTranslated is called when no translation happened [\#3803](https://github.com/danielgindi/Charts/issues/3803)
+- Xcode10 real machine operation error！ [\#3802](https://github.com/danielgindi/Charts/issues/3802)
+- Bar Width issue after reset the data [\#3801](https://github.com/danielgindi/Charts/issues/3801)
+- Performance issue:  drawCircles\(context: CGContext\) in LineChart [\#3798](https://github.com/danielgindi/Charts/issues/3798)
+- LineChartView Y-Aixs label'number inaccuracy [\#3794](https://github.com/danielgindi/Charts/issues/3794)
+- charts在特定范围内的参考坐标精度问题 [\#3793](https://github.com/danielgindi/Charts/issues/3793)
+- Change chart legend show order [\#3791](https://github.com/danielgindi/Charts/issues/3791)
+- hello,I don't want to display the pie chart by zero percent. How can I do this [\#3790](https://github.com/danielgindi/Charts/issues/3790)
+- how to center legend text of LineChartView? [\#3789](https://github.com/danielgindi/Charts/issues/3789)
+- How to Plot  only for the available x axis and leave the rest of the x axis blank? [\#3788](https://github.com/danielgindi/Charts/issues/3788)
+- Custom chart marker [\#3787](https://github.com/danielgindi/Charts/issues/3787)
+- How to shift  xAxis values to right?  [\#3785](https://github.com/danielgindi/Charts/issues/3785)
+- How to disable Accessibility support? [\#3782](https://github.com/danielgindi/Charts/issues/3782)
+- Feature: Add option to draw limit lines on top of data [\#3781](https://github.com/danielgindi/Charts/issues/3781)
+- Legend spacing issue with LineChart and colors\[\] [\#3780](https://github.com/danielgindi/Charts/issues/3780)
+- How to change value line length for each value in pieChartView [\#3776](https://github.com/danielgindi/Charts/issues/3776)
+- Crash on the function isDrawingValuesAllowed [\#3772](https://github.com/danielgindi/Charts/issues/3772)
+- How to let y axis line show same space when axisMinimum = 0? [\#3771](https://github.com/danielgindi/Charts/issues/3771)
+- Xcode 10.1  pod install Charts  open project error!!! [\#3769](https://github.com/danielgindi/Charts/issues/3769)
+- Is it possible to make some gaps on a same line plot? [\#3765](https://github.com/danielgindi/Charts/issues/3765)
+- Is it possible to draw custom shape on chart and handle touch on it [\#3763](https://github.com/danielgindi/Charts/issues/3763)
+- Start slice automatically seleted in pie chart [\#3762](https://github.com/danielgindi/Charts/issues/3762)
+- How to change color when press down on pie chart? [\#3761](https://github.com/danielgindi/Charts/issues/3761)
+- notifyDataSetChanged\(\) crash when datapoint is highlighted in LineChartView [\#3759](https://github.com/danielgindi/Charts/issues/3759)
+- BarChartView display half in first bar when change from group bar to bar only [\#3757](https://github.com/danielgindi/Charts/issues/3757)
+- Description of Bar doesn't appear in Horizontal BarChartView [\#3756](https://github.com/danielgindi/Charts/issues/3756)
+- Chart spacing between xAxis Labels [\#3755](https://github.com/danielgindi/Charts/issues/3755)
+- Granularity makes my app crash because require index from zero [\#3753](https://github.com/danielgindi/Charts/issues/3753)
+- this counter will make your app being crash in particular case [\#3752](https://github.com/danielgindi/Charts/issues/3752)
+- Bar Chart Drawing is wrong without setting axisminimum [\#3751](https://github.com/danielgindi/Charts/issues/3751)
+- Help needed - in changing the position  for Piechart in SWIFT [\#3749](https://github.com/danielgindi/Charts/issues/3749)
+- When using CombinedChartView, CandleChartData cannot be displayed [\#3748](https://github.com/danielgindi/Charts/issues/3748)
+- Linear chart line with different thickness of direction [\#3746](https://github.com/danielgindi/Charts/issues/3746)
+- I want to try a lot of line charts corresponding to the X axis is different, how can I achieve it. [\#3745](https://github.com/danielgindi/Charts/issues/3745)
+- 折线图-具体时间的数据绘制进图表问题 [\#3743](https://github.com/danielgindi/Charts/issues/3743)
+- Changing lineCap doesn't work when mode is not linear/stepped [\#3739](https://github.com/danielgindi/Charts/issues/3739)
+- Reverse Pie Chart animation [\#3738](https://github.com/danielgindi/Charts/issues/3738)
+- How to create y-axis for empty label ? [\#3735](https://github.com/danielgindi/Charts/issues/3735)
+- Different colors for above and below 0 when filling a Line Chart [\#3733](https://github.com/danielgindi/Charts/issues/3733)
+- How to adding multiple lines to Line Chart for swift 4.0? [\#3732](https://github.com/danielgindi/Charts/issues/3732)
+- How to format y-values drawn on bar? [\#3731](https://github.com/danielgindi/Charts/issues/3731)
+- how to moveViewToX and not calling setNeedsDisplay\(\) [\#3730](https://github.com/danielgindi/Charts/issues/3730)
+- When using CombinedChartView, CandleChartData cannot be displayed [\#3729](https://github.com/danielgindi/Charts/issues/3729)
+- Need Help. How to show labels in xAxis for GroupedBarChart? [\#3728](https://github.com/danielgindi/Charts/issues/3728)
+- Force axis granularity [\#3727](https://github.com/danielgindi/Charts/issues/3727)
+- Y decimal values error [\#3725](https://github.com/danielgindi/Charts/issues/3725)
+-  if i have 840entrys how can i set the xaxis what i want .e.g i only want to show the 0 and 840 [\#3723](https://github.com/danielgindi/Charts/issues/3723)
+- if i have 840entrys how can i set the xaxis what i want .e.g i only want to show the 0 and 840 [\#3722](https://github.com/danielgindi/Charts/issues/3722)
+- Align both right and left axis in the same line [\#3720](https://github.com/danielgindi/Charts/issues/3720)
+- The `open var noDataTextAlignment: NSTextAlignment = .left` is missing the `@objc` so it's not exposed in Objective C. [\#3719](https://github.com/danielgindi/Charts/issues/3719)
+- How to hide bottom colors & label section in Bar Chat [\#3718](https://github.com/danielgindi/Charts/issues/3718)
+- Draw Line chart for non linear X-axis [\#3717](https://github.com/danielgindi/Charts/issues/3717)
+- Any way to adjust the candle bar width? [\#3716](https://github.com/danielgindi/Charts/issues/3716)
+- xAxis grid line in-between bar rather than center of bar [\#3713](https://github.com/danielgindi/Charts/issues/3713)
+- Bubble Chart is not rendering [\#3711](https://github.com/danielgindi/Charts/issues/3711)
+- Bubble Chart is not rendering [\#3710](https://github.com/danielgindi/Charts/issues/3710)
+- \[Feature request\] Continue line chart beyond x-axis limits [\#3708](https://github.com/danielgindi/Charts/issues/3708)
+- Use of unresolved identifier 'UIAccessibility' & Type 'UIAccessibilityTraits' \(aka 'UInt64'\) has no member 'header' [\#3707](https://github.com/danielgindi/Charts/issues/3707)
+- How to draw a line chart in sections? [\#3706](https://github.com/danielgindi/Charts/issues/3706)
+- \[Feature / Help\] Resize Chart based on data visibility [\#3705](https://github.com/danielgindi/Charts/issues/3705)
+- \[Request / Help\] Resize Chart based on hidden / shown lines [\#3704](https://github.com/danielgindi/Charts/issues/3704)
+- listening for click events in pieChartView [\#3703](https://github.com/danielgindi/Charts/issues/3703)
+- How to add Strings on Left Axis in iOS-charts? [\#3702](https://github.com/danielgindi/Charts/issues/3702)
+- \[Charts.BarChartDataSet setDrawIconsEnabled:\]: unrecognized selector sent to instance [\#3700](https://github.com/danielgindi/Charts/issues/3700)
+- How can I set xAxis to second line? [\#3698](https://github.com/danielgindi/Charts/issues/3698)
+- Add to OC project and the api is so big, How to solve this problem [\#3697](https://github.com/danielgindi/Charts/issues/3697)
+- How can I call func stringForValue\(\_ value: Double, axis: AxisBase?\) -\> String [\#3696](https://github.com/danielgindi/Charts/issues/3696)
+- Line chart, slide left and right to see more data? How to set it up [\#3693](https://github.com/danielgindi/Charts/issues/3693)
+- Value for SWIFT\_VERSION cannot be empty. \(in target 'Charts'\) [\#3692](https://github.com/danielgindi/Charts/issues/3692)
+- how to make a combine chart \(line chart +  bar chart\) with leftAxis taking the top half area of the combined graph and right axis taking the bottom half  [\#3690](https://github.com/danielgindi/Charts/issues/3690)
+- is there any library for Gantt chart in ios swift ? please suggest me a solution..... [\#3688](https://github.com/danielgindi/Charts/issues/3688)
+- Integrated to xcode10 crash [\#3687](https://github.com/danielgindi/Charts/issues/3687)
+- XCode 10 app crash. [\#3686](https://github.com/danielgindi/Charts/issues/3686)
+- Getting Errors in Xcode 9.2 [\#3684](https://github.com/danielgindi/Charts/issues/3684)
+- How to show double vale with string in y-axis [\#3683](https://github.com/danielgindi/Charts/issues/3683)
+- When I have a lot of data, how can I slide to the far right by default? [\#3682](https://github.com/danielgindi/Charts/issues/3682)
+- Pie Chart - Slices are not drawn and values are overlapping [\#3679](https://github.com/danielgindi/Charts/issues/3679)
+- setVisibleXRangeMaximum is behaving unexpectedly [\#3678](https://github.com/danielgindi/Charts/issues/3678)
+- Getting issues after pod update. [\#3677](https://github.com/danielgindi/Charts/issues/3677)
+- Pie chart and gradient [\#3674](https://github.com/danielgindi/Charts/issues/3674)
+- CandleStickChartRenderer drawDataSet method does not work with CombinedChartView [\#3673](https://github.com/danielgindi/Charts/issues/3673)
+- How to Hide Text? [\#3672](https://github.com/danielgindi/Charts/issues/3672)
+- Memory leaks were detected also in the demo project [\#3671](https://github.com/danielgindi/Charts/issues/3671)
+- Can't add two pie charts in a uiviewcontroller at same time [\#3670](https://github.com/danielgindi/Charts/issues/3670)
+- ChartData ValueTextColor can not achieve a variety of colors [\#3669](https://github.com/danielgindi/Charts/issues/3669)
+- PieChartView settings color is Invalid  [\#3668](https://github.com/danielgindi/Charts/issues/3668)
+- DrawValuesEnabled variable unreachable \(Swift 4.2\) [\#3665](https://github.com/danielgindi/Charts/issues/3665)
+- Failed to verify bitcode in Charts.framework [\#3663](https://github.com/danielgindi/Charts/issues/3663)
+- \[3.2.0\] Excessive Memory leaks in Swift 4.2 related to LineChartView, not present in 3.1.1 w/Swift 4 [\#3649](https://github.com/danielgindi/Charts/issues/3649)
+- BarChart - xAxis Labels disappear if not a min of 2 on the screen [\#2854](https://github.com/danielgindi/Charts/issues/2854)
+- 柱状图一直横向拉伸， 持续差不多 15s 就崩溃了  [\#2642](https://github.com/danielgindi/Charts/issues/2642)
+- Any one try to integrate with SpriteKit/SKScene ? [\#2129](https://github.com/danielgindi/Charts/issues/2129)
+
+**Merged pull requests:**
+
+- Add Collection conformances to ChartDataSet types [\#3815](https://github.com/danielgindi/Charts/pull/3815) ([jjatie](https://github.com/jjatie))
+- Fix condition that is checked before `chartTranslated` delegate method call [\#3804](https://github.com/danielgindi/Charts/pull/3804) ([anton-filimonov](https://github.com/anton-filimonov))
+- fix \#3719 [\#3778](https://github.com/danielgindi/Charts/pull/3778) ([liuxuan30](https://github.com/liuxuan30))
+- Turned gradient components and locations into constants [\#3775](https://github.com/danielgindi/Charts/pull/3775) ([jjatie](https://github.com/jjatie))
+- add chartScaled\(\) call after double tap in BarLineChartViewBase [\#3770](https://github.com/danielgindi/Charts/pull/3770) ([artemiusmk](https://github.com/artemiusmk))
+- Fixes sharp edges on the line chart [\#3764](https://github.com/danielgindi/Charts/pull/3764) ([stokatyan](https://github.com/stokatyan))
+- Fix applying lineCap value for line chart data sets \(Fixes \#3739\) [\#3740](https://github.com/danielgindi/Charts/pull/3740) ([anton-filimonov](https://github.com/anton-filimonov))
+- Update README.md [\#3737](https://github.com/danielgindi/Charts/pull/3737) ([justinlew](https://github.com/justinlew))
+- Fix legend offset bug for horizontal bar chart \(Fixes \#3301\) [\#3736](https://github.com/danielgindi/Charts/pull/3736) ([SvenMuc](https://github.com/SvenMuc))
+- Fix wrong assignment to axisMaxLabels property [\#3721](https://github.com/danielgindi/Charts/pull/3721) ([ggirotto](https://github.com/ggirotto))
+- Add missing properties to copy\(with:\) methods [\#3715](https://github.com/danielgindi/Charts/pull/3715) ([dstranz](https://github.com/dstranz))
+- Multiple colors for valueline \(Fixes \#3480\) [\#3709](https://github.com/danielgindi/Charts/pull/3709) ([AlexeiGitH](https://github.com/AlexeiGitH))
+- Fix memory leak after rendering [\#3680](https://github.com/danielgindi/Charts/pull/3680) ([YusukeOba](https://github.com/YusukeOba))
+- fix issue \#3662 [\#3664](https://github.com/danielgindi/Charts/pull/3664) ([Michael-Du](https://github.com/Michael-Du))
+- Make NSUIAccessibilityElement initializer public. [\#3654](https://github.com/danielgindi/Charts/pull/3654) ([417-72KI](https://github.com/417-72KI))
+- improvements in barRect height calculation  [\#3650](https://github.com/danielgindi/Charts/pull/3650) ([potato04](https://github.com/potato04))
+- Update document to latest format [\#3621](https://github.com/danielgindi/Charts/pull/3621) ([kemchenj](https://github.com/kemchenj))
+- Feature - ChartView Pan Ended Delegate Call [\#3612](https://github.com/danielgindi/Charts/pull/3612) ([AntonTheDev](https://github.com/AntonTheDev))
+- Axis Renderers Cleanup [\#3164](https://github.com/danielgindi/Charts/pull/3164) ([jjatie](https://github.com/jjatie))
+
+## [v3.2.1](https://github.com/danielgindi/Charts/tree/v3.2.1) (2018-10-08)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.2.0...v3.2.1)
+
+**Closed issues:**
+
+- Getting error after updating XCode to 10 from 9.4  [\#3661](https://github.com/danielgindi/Charts/issues/3661)
+- Bar Chart with horizondal scroll on clicking button. [\#3660](https://github.com/danielgindi/Charts/issues/3660)
+- How to change the piechart' valueLineColor and valueTextColor color individually [\#3658](https://github.com/danielgindi/Charts/issues/3658)
+- Update to Swift 4.2 [\#3655](https://github.com/danielgindi/Charts/issues/3655)
+- I am trying to use charts. for ios app. I am using cocoa pod for dependency setup. After setup i am trying to build the code it throwing compile errors. [\#3653](https://github.com/danielgindi/Charts/issues/3653)
+- Type 'RunLoop' has no member 'Mode'  [\#3652](https://github.com/danielgindi/Charts/issues/3652)
+- Module compiled with Swift 4.1.2 cannot be imported by the Swift 4.2  [\#3651](https://github.com/danielgindi/Charts/issues/3651)
+- Type 'RunLoop' has no member 'Mode' [\#3648](https://github.com/danielgindi/Charts/issues/3648)
+- As of todays update, I am running into this issue. 'common' renamed RunLoopMode.commonModes [\#3647](https://github.com/danielgindi/Charts/issues/3647)
+- Change circleHoleColor for one point  [\#3646](https://github.com/danielgindi/Charts/issues/3646)
+- This API is not working with Swift 4.1.. even after taking V3.2 of Charts API also.. I fixed it myself :\( [\#3645](https://github.com/danielgindi/Charts/issues/3645)
+- Help building Charts Demo  [\#3643](https://github.com/danielgindi/Charts/issues/3643)
+- Limit line label orientation [\#3641](https://github.com/danielgindi/Charts/issues/3641)
+- Is it possible to zoom into a range of values? [\#3639](https://github.com/danielgindi/Charts/issues/3639)
+- Not working with SDK-Swift 4.2 [\#3635](https://github.com/danielgindi/Charts/issues/3635)
+- getting the error that let is implicitly final please change from open to public in Xcode10 GM Seed [\#3634](https://github.com/danielgindi/Charts/issues/3634)
+- How to optimize when the amount of data is large [\#3633](https://github.com/danielgindi/Charts/issues/3633)
+- Adding mathematical function plotting [\#3632](https://github.com/danielgindi/Charts/issues/3632)
+- Color shadow inside piechart [\#3631](https://github.com/danielgindi/Charts/issues/3631)
+- I can not set one label on y axis. [\#3630](https://github.com/danielgindi/Charts/issues/3630)
+- where is the code for draw the xAxis and yAxis indicateLine [\#3628](https://github.com/danielgindi/Charts/issues/3628)
+- Is it possible to add a vertical label for Y-Axis? Or anyone working on it? [\#3627](https://github.com/danielgindi/Charts/issues/3627)
+- Adding dashed lines in between bars in bar graph [\#3626](https://github.com/danielgindi/Charts/issues/3626)
+- Create Line chart and/or Bar chart from String Array [\#3625](https://github.com/danielgindi/Charts/issues/3625)
+- Change data if button press [\#3624](https://github.com/danielgindi/Charts/issues/3624)
+- Pie Chart and Legend [\#3622](https://github.com/danielgindi/Charts/issues/3622)
+- Add labels to marker or create custom marker view [\#3620](https://github.com/danielgindi/Charts/issues/3620)
+- is there any way we can change the values font size for ipad in the same code?  [\#3618](https://github.com/danielgindi/Charts/issues/3618)
+- Reg: Display Min and Max Point in a PopUp [\#3617](https://github.com/danielgindi/Charts/issues/3617)
+- Charts ScaleX problem [\#3616](https://github.com/danielgindi/Charts/issues/3616)
+- CombinedChartView - EXC\_BAD\_ACCESS with doubleTapToZoomEnabled [\#3614](https://github.com/danielgindi/Charts/issues/3614)
+- BarChartView  How to set the fixed width and spacing？ [\#3609](https://github.com/danielgindi/Charts/issues/3609)
+- How can I combine two lineCharts？ [\#3607](https://github.com/danielgindi/Charts/issues/3607)
+-  'Charts/Charts-Swift.h' file not found [\#3603](https://github.com/danielgindi/Charts/issues/3603)
+- Combined Chart  with Horizontal Bar chart and a Line chart [\#3600](https://github.com/danielgindi/Charts/issues/3600)
+- Design customization [\#3597](https://github.com/danielgindi/Charts/issues/3597)
+- Move pie chart to specific location in the view [\#3595](https://github.com/danielgindi/Charts/issues/3595)
+- Adding text data points to axis [\#3592](https://github.com/danielgindi/Charts/issues/3592)
+- Performance hit [\#3585](https://github.com/danielgindi/Charts/issues/3585)
+- Multiple colours for setValueTextColor and xAxis label with NSAttributedString [\#3566](https://github.com/danielgindi/Charts/issues/3566)
+- Can't set a fixed width for YAxis with outside style. [\#3565](https://github.com/danielgindi/Charts/issues/3565)
+- Switch from Grouped Bar chart back to normal [\#3551](https://github.com/danielgindi/Charts/issues/3551)
+- X or Y axis interval of the labels  [\#3547](https://github.com/danielgindi/Charts/issues/3547)
+- How can I plot all Axis Value? [\#3540](https://github.com/danielgindi/Charts/issues/3540)
+- When the number of numeric numbers on the Y axis does not agree, the right of the multiple charts will not be aligned. [\#3347](https://github.com/danielgindi/Charts/issues/3347)
+
+## [v3.2.0](https://github.com/danielgindi/Charts/tree/v3.2.0) (2018-09-17)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.1.1...v3.2.0)
+
+**Fixed bugs:**
+
+- Remove noDataText [\#3396](https://github.com/danielgindi/Charts/issues/3396)
+
+**Closed issues:**
+
+- Xcode 10 beta & Swift 4.2 support [\#3623](https://github.com/danielgindi/Charts/issues/3623)
+- CombinedChartView not population correctly  [\#3619](https://github.com/danielgindi/Charts/issues/3619)
+- How to remove Cubic Line chart value? [\#3615](https://github.com/danielgindi/Charts/issues/3615)
+- How to set Y axis to display different colors of label [\#3611](https://github.com/danielgindi/Charts/issues/3611)
+- Installation with carthage error!!! [\#3610](https://github.com/danielgindi/Charts/issues/3610)
+- xcodebuild archive error [\#3606](https://github.com/danielgindi/Charts/issues/3606)
+- swift library added successfully, but can't reach any of the interfaces [\#3605](https://github.com/danielgindi/Charts/issues/3605)
+- BarChart draw sum of values above bar  [\#3604](https://github.com/danielgindi/Charts/issues/3604)
+- iOS 12 [\#3601](https://github.com/danielgindi/Charts/issues/3601)
+- v [\#3598](https://github.com/danielgindi/Charts/issues/3598)
+- Compilation errors with Swift 4.1 [\#3596](https://github.com/danielgindi/Charts/issues/3596)
+- Bar Chart highlights last clicked bar [\#3594](https://github.com/danielgindi/Charts/issues/3594)
+- Remove hightlight, when swipe ends. Or just catch event when swipe ends [\#3588](https://github.com/danielgindi/Charts/issues/3588)
+- bars did not displayed as expect [\#3586](https://github.com/danielgindi/Charts/issues/3586)
+- what about the property 'gradientPositions' on branch 4.0.0, and how to use [\#3584](https://github.com/danielgindi/Charts/issues/3584)
+- Creating markers for Radar Charts [\#3582](https://github.com/danielgindi/Charts/issues/3582)
+- How to display value on touch? [\#3581](https://github.com/danielgindi/Charts/issues/3581)
+- LineChart \(gradient fill\) is not working in Swift 4 [\#3580](https://github.com/danielgindi/Charts/issues/3580)
+- Is there a way to use Line Chart with custom xAxis? [\#3579](https://github.com/danielgindi/Charts/issues/3579)
+- Xaxis MutliLine and Value Multiline [\#3575](https://github.com/danielgindi/Charts/issues/3575)
+- REACT NATIVE CHART ISSUE [\#3574](https://github.com/danielgindi/Charts/issues/3574)
+- Data labels not shown when mutable array of entries used.  [\#3573](https://github.com/danielgindi/Charts/issues/3573)
+- Grid background color extends beyond data sets [\#3572](https://github.com/danielgindi/Charts/issues/3572)
+- real time plot [\#3571](https://github.com/danielgindi/Charts/issues/3571)
+- Add shadow effect for pie chart [\#3570](https://github.com/danielgindi/Charts/issues/3570)
+- The target “Charts” contains source code developed with Swift 2.x. Xcode 9 does not support building or migrating Swift 2.x targets. [\#3569](https://github.com/danielgindi/Charts/issues/3569)
+- What is the best way to show around 100'000 values? [\#3568](https://github.com/danielgindi/Charts/issues/3568)
+- CandleChart In CombinedChartView not work [\#3567](https://github.com/danielgindi/Charts/issues/3567)
+- the x axis label is not in the right position when I used groupBarChart [\#3564](https://github.com/danielgindi/Charts/issues/3564)
+- Bar Charts with only top outline like line chart [\#3562](https://github.com/danielgindi/Charts/issues/3562)
+- How to fill the area between two lines on LineChart [\#3561](https://github.com/danielgindi/Charts/issues/3561)
+- How to support rose chart? [\#3560](https://github.com/danielgindi/Charts/issues/3560)
+- How I can get unselected entry [\#3559](https://github.com/danielgindi/Charts/issues/3559)
+- Custom x-axis labels won't show without backing data [\#3557](https://github.com/danielgindi/Charts/issues/3557)
+- Cannot build Charts project using Carthage [\#3555](https://github.com/danielgindi/Charts/issues/3555)
+- Customizing bar chart [\#3554](https://github.com/danielgindi/Charts/issues/3554)
+- Line Chart: Can't display icons unless data labels are also displayed [\#3553](https://github.com/danielgindi/Charts/issues/3553)
+- How to enable highlight to some datapoints only when chart is zoomed  [\#3552](https://github.com/danielgindi/Charts/issues/3552)
+- 关于OC项目引入Charts IPA体积过大的问题 [\#3549](https://github.com/danielgindi/Charts/issues/3549)
+- X or Y unit？How to do? [\#3545](https://github.com/danielgindi/Charts/issues/3545)
+- Why my chart have line on zero on yAXis  [\#3544](https://github.com/danielgindi/Charts/issues/3544)
+- Value of type 'EnumeratedSequence\<\[CGPoint\]\>' has no member 'compactMap' [\#3543](https://github.com/danielgindi/Charts/issues/3543)
+- Show Axis unit in last label [\#3542](https://github.com/danielgindi/Charts/issues/3542)
+- In iOS-Charts how to hide one of Y axis grid lines.  [\#3541](https://github.com/danielgindi/Charts/issues/3541)
+- Highlighting on a scrollable line graph [\#3539](https://github.com/danielgindi/Charts/issues/3539)
+- disable gradient fill Linechart [\#3537](https://github.com/danielgindi/Charts/issues/3537)
+- Undefined symbols for architecture - import issues [\#3536](https://github.com/danielgindi/Charts/issues/3536)
+- Horizontal Bar Chart Bar Collapsing [\#3535](https://github.com/danielgindi/Charts/issues/3535)
+- How to remove space between line chart and top legend [\#3534](https://github.com/danielgindi/Charts/issues/3534)
+- Scrolling of bar chart is not working initially.  [\#3532](https://github.com/danielgindi/Charts/issues/3532)
+- Remove DataSet label [\#3531](https://github.com/danielgindi/Charts/issues/3531)
+- HorizontalBarChartView 横向柱状图Y轴问题 [\#3530](https://github.com/danielgindi/Charts/issues/3530)
+- 怎么设置柱状图的宽度不变 [\#3529](https://github.com/danielgindi/Charts/issues/3529)
+- Is it possible to show the values of a horizontal stacked bar chart centered? [\#3526](https://github.com/danielgindi/Charts/issues/3526)
+- how to change LineChartDataSet without strange redraw issues? [\#3525](https://github.com/danielgindi/Charts/issues/3525)
+- I want to add image in left side of line graph when we scroll the image is also scroll  [\#3521](https://github.com/danielgindi/Charts/issues/3521)
+- Fixed label at axis origin [\#3519](https://github.com/danielgindi/Charts/issues/3519)
+- Horizontal bar charts labels max out too early [\#3517](https://github.com/danielgindi/Charts/issues/3517)
+- multiple PieCharts in on Screen [\#3516](https://github.com/danielgindi/Charts/issues/3516)
+- First and Last Bars are not displaying full bars in CombinedChartView [\#3515](https://github.com/danielgindi/Charts/issues/3515)
+- Line chart does not render correctly [\#3514](https://github.com/danielgindi/Charts/issues/3514)
+- Line chart with LineChartView the line is lower than the minimum values [\#3513](https://github.com/danielgindi/Charts/issues/3513)
+- Bar chart is plotting for empty value and Line chart is not appeared in CombinedChartView [\#3511](https://github.com/danielgindi/Charts/issues/3511)
+- The shape of graph becomes smaller and smaller in RadarChartGraph [\#3510](https://github.com/danielgindi/Charts/issues/3510)
+- not able to display x-axis labels like \(jun, july\) in line chart [\#3509](https://github.com/danielgindi/Charts/issues/3509)
+- Move points on LineChart with Pan Gesture [\#3508](https://github.com/danielgindi/Charts/issues/3508)
+- 32 bit Device not handling high x-values [\#3507](https://github.com/danielgindi/Charts/issues/3507)
+- How do you override the getFormattedValue\(\) method when it doesn't exist? [\#3506](https://github.com/danielgindi/Charts/issues/3506)
+- drawBarShadowEnabled is crashing in swift 4 [\#3505](https://github.com/danielgindi/Charts/issues/3505)
+- x,y axis and guidelines hide on grah reload [\#3503](https://github.com/danielgindi/Charts/issues/3503)
+- 显示float问题 [\#3501](https://github.com/danielgindi/Charts/issues/3501)
+- App Crash in release mode not in debug mode  [\#3499](https://github.com/danielgindi/Charts/issues/3499)
+- Arrow on axis end [\#3498](https://github.com/danielgindi/Charts/issues/3498)
+- LineChartView setup  "set.mode = LineChartModeCubicBezier",The wave-peak trough of the smooth chart shows no value and deviates from these points [\#3497](https://github.com/danielgindi/Charts/issues/3497)
+- Errors when trying to compile a project using Charts [\#3496](https://github.com/danielgindi/Charts/issues/3496)
+- Need Help I want to Make 2 lines of X axis label and x axis label background color [\#3495](https://github.com/danielgindi/Charts/issues/3495)
+- Getting current xAxis value [\#3494](https://github.com/danielgindi/Charts/issues/3494)
+- where to catch the function about marker disappears or appears with dataEntrance [\#3493](https://github.com/danielgindi/Charts/issues/3493)
+- Get chart image without rendering chart [\#3492](https://github.com/danielgindi/Charts/issues/3492)
+- Cant able to set XAxis Range for custom DateTime formatter [\#3491](https://github.com/danielgindi/Charts/issues/3491)
+- How to set the accuracy of data, such as two decimal places, e.g 2.32, 3.21. [\#3490](https://github.com/danielgindi/Charts/issues/3490)
+- FFT graphs? [\#3489](https://github.com/danielgindi/Charts/issues/3489)
+- Is there a better way to easily add highest and lowest value in candlestick chart [\#3488](https://github.com/danielgindi/Charts/issues/3488)
+- Remove piechart center white area [\#3487](https://github.com/danielgindi/Charts/issues/3487)
+- xAxis label is croped  when using custom valueFormatter [\#3485](https://github.com/danielgindi/Charts/issues/3485)
+- Change location of left axis labels [\#3484](https://github.com/danielgindi/Charts/issues/3484)
+- How to plot multiple yValue but display selected xValue in xAxis Label? [\#3483](https://github.com/danielgindi/Charts/issues/3483)
+- Bubble Charts Choose not jump into the method “chartValueSelected...”? [\#3482](https://github.com/danielgindi/Charts/issues/3482)
+- How to plot time value format on x-axis in real time graph [\#3481](https://github.com/danielgindi/Charts/issues/3481)
+- How to remove Right side vertical line and values in LineChartView [\#3478](https://github.com/danielgindi/Charts/issues/3478)
+- Bar Chart View acting weird \(zooming\) [\#3477](https://github.com/danielgindi/Charts/issues/3477)
+- Is their anyway to show legend in rows and columns format? [\#3476](https://github.com/danielgindi/Charts/issues/3476)
+- Duplicate Y-axis values while pitching the graph moving up [\#3475](https://github.com/danielgindi/Charts/issues/3475)
+- getValuesByTouchPoint / UIView coords to graph coords [\#3474](https://github.com/danielgindi/Charts/issues/3474)
+- Pie Chart label not show if its value 0 [\#3473](https://github.com/danielgindi/Charts/issues/3473)
+- Build failed [\#3472](https://github.com/danielgindi/Charts/issues/3472)
+- What will be the version of pod if I am running on swift 2.3 ? [\#3471](https://github.com/danielgindi/Charts/issues/3471)
+- Using SPM results in a "dependency graph is unresolvable" error. [\#3470](https://github.com/danielgindi/Charts/issues/3470)
+- Demo is not compiling [\#3469](https://github.com/danielgindi/Charts/issues/3469)
+- Question [\#3466](https://github.com/danielgindi/Charts/issues/3466)
+- need help [\#3464](https://github.com/danielgindi/Charts/issues/3464)
+- bar Chart legend always show one label [\#3462](https://github.com/danielgindi/Charts/issues/3462)
+- Monitor rotation angle [\#3461](https://github.com/danielgindi/Charts/issues/3461)
+-  when clicking chartView,How to prompt multiple markerView [\#3460](https://github.com/danielgindi/Charts/issues/3460)
+- The chart will draw incorrectly if LineChart leftAxis.axisMinimum does not start at zero [\#3458](https://github.com/danielgindi/Charts/issues/3458)
+- Grouped bar chart plotting wrong !! [\#3457](https://github.com/danielgindi/Charts/issues/3457)
+- 为什么我设置X轴不显示 [\#3456](https://github.com/danielgindi/Charts/issues/3456)
+- how to set string values on x axis in bar chart? please help [\#3455](https://github.com/danielgindi/Charts/issues/3455)
+- Left axis and right axis not same zero line [\#3454](https://github.com/danielgindi/Charts/issues/3454)
+- How can make HorizontalBarChart dont start at zero? [\#3453](https://github.com/danielgindi/Charts/issues/3453)
+- Can't customise X-axis grid line labels in time value line chart. [\#3452](https://github.com/danielgindi/Charts/issues/3452)
+- xAxis gridlines are missing [\#3451](https://github.com/danielgindi/Charts/issues/3451)
+- How to add attributed string in Xaxis labels [\#3450](https://github.com/danielgindi/Charts/issues/3450)
+- 点击0这一列，所有的柱状图都高亮，可以吗 [\#3449](https://github.com/danielgindi/Charts/issues/3449)
+- how to use 'LineChartView' to draw a line between nonzero values? [\#3448](https://github.com/danielgindi/Charts/issues/3448)
+- The maximum value of the histogram is not shown. [\#3447](https://github.com/danielgindi/Charts/issues/3447)
+- The Y-axis numerical display problem. [\#3446](https://github.com/danielgindi/Charts/issues/3446)
+- Is it possible to show x-Axis gridlines when there's only one ChartDataEntry? [\#3444](https://github.com/danielgindi/Charts/issues/3444)
+- Chart callback events [\#3443](https://github.com/danielgindi/Charts/issues/3443)
+- Help needed with Grouped Horizontal Bar Chart [\#3442](https://github.com/danielgindi/Charts/issues/3442)
+- Candlestick doesn't work when x does not start at 0 [\#3441](https://github.com/danielgindi/Charts/issues/3441)
+- Is there a callback method? [\#3439](https://github.com/danielgindi/Charts/issues/3439)
+- oc项目集成Charts，上架打包失败，提示ERROR ITMS-90171: "Invalid Bundle Structure - The binary file '时间炼.app/Frameworks/Charts.framework/Charts' is not permitted. Your app can’t contain standalone executables or libraries, other than a valid CFBundleExecutable of supported bundles. Refer to the Bundle Programming Guide at https://developer.apple.com/go/?id=bundle-structure for information on the iOS app bundle structure."。新手，求解答！Thanks [\#3438](https://github.com/danielgindi/Charts/issues/3438)
+- Axis label alignment with labelRotationAngle [\#3437](https://github.com/danielgindi/Charts/issues/3437)
+- Show grid with axis deactivated [\#3436](https://github.com/danielgindi/Charts/issues/3436)
+- Error: cannot use instance member '\_viewPortHandler' within property initializer; property initializers run before 'self' is available [\#3434](https://github.com/danielgindi/Charts/issues/3434)
+- remove labels [\#3433](https://github.com/danielgindi/Charts/issues/3433)
+- How to set the number of lines for the label of xAxis of HorizontalBarChartView ? [\#3431](https://github.com/danielgindi/Charts/issues/3431)
+- xAxis labelText too long, it can not draw complete. [\#3430](https://github.com/danielgindi/Charts/issues/3430)
+- Weird crash [\#3427](https://github.com/danielgindi/Charts/issues/3427)
+- Why does the default value of the Y label take the decimal point? [\#3426](https://github.com/danielgindi/Charts/issues/3426)
+- Why won't the viewport move to the last X value of my line chart? [\#3425](https://github.com/danielgindi/Charts/issues/3425)
+- How to disable highlight for some specific values [\#3423](https://github.com/danielgindi/Charts/issues/3423)
+- IAxisValueFormatter Error:  Index out of range [\#3422](https://github.com/danielgindi/Charts/issues/3422)
+- can we animate SelectionShift when selecting a segment of pie chart? [\#3420](https://github.com/danielgindi/Charts/issues/3420)
+- Y-axis minimum scale deviation problem. [\#3419](https://github.com/danielgindi/Charts/issues/3419)
+- How do you set the scale of the Y-axis? [\#3418](https://github.com/danielgindi/Charts/issues/3418)
+- BarLineChartViewBase doubleTapGestureRecognized  [\#3417](https://github.com/danielgindi/Charts/issues/3417)
+- Remove the box from the pie chart. [\#3416](https://github.com/danielgindi/Charts/issues/3416)
+- Unable to set transparent color or clear color to the graphs background. [\#3414](https://github.com/danielgindi/Charts/issues/3414)
+- BarChartView has no TouchUpInside event, only TouchDown event. [\#3411](https://github.com/danielgindi/Charts/issues/3411)
+- YAxis,the integer bit is missing, showing.0 or.00 [\#3410](https://github.com/danielgindi/Charts/issues/3410)
+- touchesEnded can't be called in chart view? [\#3409](https://github.com/danielgindi/Charts/issues/3409)
+- Is it possible to show date values in the Stacked BarChart? [\#3408](https://github.com/danielgindi/Charts/issues/3408)
+- Passing STRING values to X-Axis currently the SetDataCount is accepting only INT and Double data types [\#3407](https://github.com/danielgindi/Charts/issues/3407)
+- compactMap build error [\#3405](https://github.com/danielgindi/Charts/issues/3405)
+- Marker in CombinedChart is displayed incorrectly. [\#3404](https://github.com/danielgindi/Charts/issues/3404)
+-  I need to customize the column chart [\#3401](https://github.com/danielgindi/Charts/issues/3401)
+- YAxis show the value .0 or .00 [\#3400](https://github.com/danielgindi/Charts/issues/3400)
+- How to do BarChart \(grouped DataSets\)\(OC\)? [\#3399](https://github.com/danielgindi/Charts/issues/3399)
+- Can't build success with xcode toolchains swift 4.0.3 release [\#3398](https://github.com/danielgindi/Charts/issues/3398)
+- pod not install in xcode 9.3 version [\#3397](https://github.com/danielgindi/Charts/issues/3397)
+- Lag during scroll [\#3395](https://github.com/danielgindi/Charts/issues/3395)
+- Hide percents on PieChartDiagram when it's so small [\#3394](https://github.com/danielgindi/Charts/issues/3394)
+- Value of type 'BarChartDataEntries' has no member 'unit' [\#3393](https://github.com/danielgindi/Charts/issues/3393)
+- BarChart 1st bar offset  [\#3392](https://github.com/danielgindi/Charts/issues/3392)
+- Open up Access Modifiers? [\#3391](https://github.com/danielgindi/Charts/issues/3391)
+- ld: warning: directory not found for option '-F/Users/hansenpen/Library/Developer/Xcode/DerivedData/CS\_PROJECT\_-\_ALPHA-hglwyidqwcstjvejzxikmednefgv/Build/Products/Debug-iphonesimulator/Charts' ld: framework not found Charts clang: error: linker command failed with exit code 1 \(use -v to see invocation\) [\#3390](https://github.com/danielgindi/Charts/issues/3390)
+- How to install charts Framework using Xcode 9.1  [\#3388](https://github.com/danielgindi/Charts/issues/3388)
+- Unable to compile swift 3.2 code from xcode  9.3. I am using 3.1.1 version of charts. [\#3387](https://github.com/danielgindi/Charts/issues/3387)
+- why there is flexible space between the BarChatView and the xAxis ? sometimes the space are nil but sometimes the space exist . when it happens the xAxis will draw rect inside the PilaView . it doesn't connected with the XAxisLabelPosition attribute . i cann't figured it out [\#3386](https://github.com/danielgindi/Charts/issues/3386)
+- Error building project [\#3385](https://github.com/danielgindi/Charts/issues/3385)
+- missing property in latest LineChartView  [\#3383](https://github.com/danielgindi/Charts/issues/3383)
+- minOffset not working [\#3382](https://github.com/danielgindi/Charts/issues/3382)
+- Display Real time data like pulseRate. [\#3381](https://github.com/danielgindi/Charts/issues/3381)
+- Grouped bar chart shows up as stacked bar chart after migration. [\#3380](https://github.com/danielgindi/Charts/issues/3380)
+- Candle stick chart cds.setBarSpace\(\) not working [\#3379](https://github.com/danielgindi/Charts/issues/3379)
+- Line chart fill color goes above/below zeroline [\#3377](https://github.com/danielgindi/Charts/issues/3377)
+- Charts Pod not working with Xcode 9.3 \(Swift 4.1\) [\#3376](https://github.com/danielgindi/Charts/issues/3376)
+- Can any one know how to draw this charts  [\#3375](https://github.com/danielgindi/Charts/issues/3375)
+- Compile error on newest ChartsDemo-iOS project [\#3373](https://github.com/danielgindi/Charts/issues/3373)
+- ChartIndexAxisValueFormatter Not working in line charts [\#3371](https://github.com/danielgindi/Charts/issues/3371)
+- Line Graph xValue [\#3367](https://github.com/danielgindi/Charts/issues/3367)
+- xAxis labels are not aligned with grouped bar,  when data is more [\#3364](https://github.com/danielgindi/Charts/issues/3364)
+- Select the data point programmatically and the highLight is NAN    [\#3363](https://github.com/danielgindi/Charts/issues/3363)
+- Layout issue with chart legend  [\#3359](https://github.com/danielgindi/Charts/issues/3359)
+- Is it possible to draw the line on top of a custom XAxisRenderer? [\#3348](https://github.com/danielgindi/Charts/issues/3348)
+- How to set x-axis labels with selected round with color. [\#3345](https://github.com/danielgindi/Charts/issues/3345)
+- How to hide the grid background on some bar  [\#3342](https://github.com/danielgindi/Charts/issues/3342)
+- Space between axis line and axis label [\#3336](https://github.com/danielgindi/Charts/issues/3336)
+- Can't manage to align plots with x axis values [\#3332](https://github.com/danielgindi/Charts/issues/3332)
+- Show the last x axis label on bar chart  [\#3324](https://github.com/danielgindi/Charts/issues/3324)
+- HorizontalBarChartView  display partial data [\#3320](https://github.com/danielgindi/Charts/issues/3320)
+- 如何在滑动代理中获取当前中心位置所对应的数据源的索引 [\#3318](https://github.com/danielgindi/Charts/issues/3318)
+- Visible max and min Y Values [\#2600](https://github.com/danielgindi/Charts/issues/2600)
+- Invert xAxis label [\#2504](https://github.com/danielgindi/Charts/issues/2504)
+- @junito1209 please explain what are you doing on Charts wiki page [\#2261](https://github.com/danielgindi/Charts/issues/2261)
+- Crash Observed when AxisRenderer interval is becoming NaN [\#2168](https://github.com/danielgindi/Charts/issues/2168)
+- Problem selecting bubbles on the same xIndex [\#2060](https://github.com/danielgindi/Charts/issues/2060)
+
+**Merged pull requests:**
+
+- Add Swift version 4.1 to podspec [\#3608](https://github.com/danielgindi/Charts/pull/3608) ([larryonoff](https://github.com/larryonoff))
+- update barRect.size.height calculation [\#3587](https://github.com/danielgindi/Charts/pull/3587) ([potato04](https://github.com/potato04))
+- Add label colors to legend entries [\#3558](https://github.com/danielgindi/Charts/pull/3558) ([petester42](https://github.com/petester42))
+- Support inlune bubble viz selection [\#3548](https://github.com/danielgindi/Charts/pull/3548) ([chuynadamas](https://github.com/chuynadamas))
+- fix the error title for demo [\#3528](https://github.com/danielgindi/Charts/pull/3528) ([yangasahi](https://github.com/yangasahi))
+- Changes for Swift 4.2, Xcode 10 and iOS 12 [\#3522](https://github.com/danielgindi/Charts/pull/3522) ([jlcanale](https://github.com/jlcanale))
+- Accessibility Support for \(most\) Chart types [\#3520](https://github.com/danielgindi/Charts/pull/3520) ([mathewa6](https://github.com/mathewa6))
+- Changed comment that referenced getFormattedValue\(\) method in IValueFormatter [\#3518](https://github.com/danielgindi/Charts/pull/3518) ([JCMcLovin](https://github.com/JCMcLovin))
+- Fix merge conflicts in \#3218 [\#3500](https://github.com/danielgindi/Charts/pull/3500) ([petester42](https://github.com/petester42))
+- Make legendRenderer property public in order to be externally customizable [\#3445](https://github.com/danielgindi/Charts/pull/3445) ([nagykatalin](https://github.com/nagykatalin))
+- Fix broken demo link in readme [\#3440](https://github.com/danielgindi/Charts/pull/3440) ([robert-cronin](https://github.com/robert-cronin))
+- Added clamping function for `Comparable` [\#3435](https://github.com/danielgindi/Charts/pull/3435) ([jjatie](https://github.com/jjatie))
+- Fix CocoaPods compilation [\#3432](https://github.com/danielgindi/Charts/pull/3432) ([larryonoff](https://github.com/larryonoff))
+- update candle chart view options in demo project [\#3424](https://github.com/danielgindi/Charts/pull/3424) ([cuong1112035](https://github.com/cuong1112035))
+- Add Objective-c compatible for turning off drag in X and Y Axis separately [\#3421](https://github.com/danielgindi/Charts/pull/3421) ([lennonhe](https://github.com/lennonhe))
+- Added gradient line drawing to LineChartRenderer. based on PR \#3142 [\#3415](https://github.com/danielgindi/Charts/pull/3415) ([larryonoff](https://github.com/larryonoff))
+- Add more render options for y axis labels [\#3406](https://github.com/danielgindi/Charts/pull/3406) ([alexrepty](https://github.com/alexrepty))
+- Refactored ChartData [\#3169](https://github.com/danielgindi/Charts/pull/3169) ([jjatie](https://github.com/jjatie))
+- Dataset logic cleanup [\#3001](https://github.com/danielgindi/Charts/pull/3001) ([jjatie](https://github.com/jjatie))
+- Added value text rotation [\#2200](https://github.com/danielgindi/Charts/pull/2200) ([chinh-tran](https://github.com/chinh-tran))
+
+## [v3.1.1](https://github.com/danielgindi/Charts/tree/v3.1.1) (2018-04-02)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.1.1...v3.1.1)
+
+## [3.1.1](https://github.com/danielgindi/Charts/tree/3.1.1) (2018-04-02)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.1.0...3.1.1)
+
+**Fixed bugs:**
+
+- ChartsDemo-Swift crashes [\#3327](https://github.com/danielgindi/Charts/issues/3327)
+
+**Closed issues:**
+
+- Why does yVals start with a negative number when the data is empty? [\#3374](https://github.com/danielgindi/Charts/issues/3374)
+- Compile Error [\#3372](https://github.com/danielgindi/Charts/issues/3372)
+- Y Axis need to add Time slots for current day [\#3368](https://github.com/danielgindi/Charts/issues/3368)
+- inconsistent include of UIKit vs AppKit [\#3362](https://github.com/danielgindi/Charts/issues/3362)
+- Crash Issue in BarChartData [\#3361](https://github.com/danielgindi/Charts/issues/3361)
+- How can we format the LABEL used for values? [\#3354](https://github.com/danielgindi/Charts/issues/3354)
+- Remove value labels padding [\#3350](https://github.com/danielgindi/Charts/issues/3350)
+- Does Charts support real-time drawing [\#3344](https://github.com/danielgindi/Charts/issues/3344)
+- Constant for Bar width and space [\#3343](https://github.com/danielgindi/Charts/issues/3343)
+- Bar Graph groupBars function issue [\#1966](https://github.com/danielgindi/Charts/issues/1966)
+- bar chart from dates [\#1963](https://github.com/danielgindi/Charts/issues/1963)
+- A crash of CombinedChartView,when touch on the chart view\(chas\) [\#1957](https://github.com/danielgindi/Charts/issues/1957)
+- Graph doesn't display on older iPads [\#1954](https://github.com/danielgindi/Charts/issues/1954)
+- Regarding deprecated xValues [\#1947](https://github.com/danielgindi/Charts/issues/1947)
+- Charts being overlaid inside UICollectionView using dequeueReusableCell [\#1943](https://github.com/danielgindi/Charts/issues/1943)
+- We are unable to split the label in two lines. [\#1941](https://github.com/danielgindi/Charts/issues/1941)
+- Make releases so they follow the Semantic Versioning \(SemVer\) [\#1930](https://github.com/danielgindi/Charts/issues/1930)
+- Marker Position [\#1876](https://github.com/danielgindi/Charts/issues/1876)
+- Charts 3.0 unable to draw discontinuous line chart [\#1866](https://github.com/danielgindi/Charts/issues/1866)
+- Radar charts custom labels [\#1840](https://github.com/danielgindi/Charts/issues/1840)
+- Unable to subclass [\#1838](https://github.com/danielgindi/Charts/issues/1838)
+- offset goes wrong when using mutiple bar chart in combined chart [\#1813](https://github.com/danielgindi/Charts/issues/1813)
+- Histogram Example? [\#1792](https://github.com/danielgindi/Charts/issues/1792)
+- Sunburst Chart [\#1715](https://github.com/danielgindi/Charts/issues/1715)
+- Line chart with preview [\#1520](https://github.com/danielgindi/Charts/issues/1520)
+- Get scroll position of dragable line chart [\#1272](https://github.com/danielgindi/Charts/issues/1272)
+- Trend line in scatter chart? [\#1263](https://github.com/danielgindi/Charts/issues/1263)
+- Can we use custom image instead of Circle in line chart? [\#1206](https://github.com/danielgindi/Charts/issues/1206)
+- Legend with NSAttributedString and multiple lines on Vertical [\#1193](https://github.com/danielgindi/Charts/issues/1193)
+- Trim the legend view  [\#1192](https://github.com/danielgindi/Charts/issues/1192)
+- Chart auto min/max does not take into account second line [\#1136](https://github.com/danielgindi/Charts/issues/1136)
+- Add different colorHoleColor for different datapoints in a LineChart iOS Charts [\#1104](https://github.com/danielgindi/Charts/issues/1104)
+- How to remove marker programatically [\#1097](https://github.com/danielgindi/Charts/issues/1097)
+- Overlapping issues in x and y axis values [\#1048](https://github.com/danielgindi/Charts/issues/1048)
+- Enhancement: Horizontal Combined Chart [\#1041](https://github.com/danielgindi/Charts/issues/1041)
+- Enhancement: Linked x-axis or stacked y-axis. [\#1022](https://github.com/danielgindi/Charts/issues/1022)
+- Scale or zoom to particular axis or point in Combined chart view [\#993](https://github.com/danielgindi/Charts/issues/993)
+- Max Value Y - Axis = 1  , How to set Y-Axis increment Y- Value ? [\#989](https://github.com/danielgindi/Charts/issues/989)
+- Drawing value for the WholeStack only [\#926](https://github.com/danielgindi/Charts/issues/926)
+- Pie chart Y values overlap [\#779](https://github.com/danielgindi/Charts/issues/779)
+- Swift Package Manager [\#753](https://github.com/danielgindi/Charts/issues/753)
+- Stacked bar chart with different number of rects [\#744](https://github.com/danielgindi/Charts/issues/744)
+- The label value position with the same yAxis and different value. [\#724](https://github.com/danielgindi/Charts/issues/724)
+- Minimum / maximum scale causes the chart to slide sideways when trying to pinch zoom further [\#437](https://github.com/danielgindi/Charts/issues/437)
+- Top and bottom grid line diverging widths [\#411](https://github.com/danielgindi/Charts/issues/411)
+
+**Merged pull requests:**
+
+- Swift 4.1 [\#3370](https://github.com/danielgindi/Charts/pull/3370) ([jjatie](https://github.com/jjatie))
+- Update ILineRadarChartDataSet.swift [\#3366](https://github.com/danielgindi/Charts/pull/3366) ([Ewg777](https://github.com/Ewg777))
+- Add option to disable clipping data to contentRect [\#3360](https://github.com/danielgindi/Charts/pull/3360) ([wtmoose](https://github.com/wtmoose))
+
+## [v3.1.0](https://github.com/danielgindi/Charts/tree/v3.1.0) (2018-03-22)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.1.0...v3.1.0)
+
+## [3.1.0](https://github.com/danielgindi/Charts/tree/3.1.0) (2018-03-22)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.0.5...3.1.0)
+
+**Fixed bugs:**
+
+- Bug in ZoomViewJob? [\#3299](https://github.com/danielgindi/Charts/issues/3299)
+- BarChartView bug if set barWidth was 1.0? [\#3213](https://github.com/danielgindi/Charts/issues/3213)
+- Scatter circle disappear when chart scaled [\#3185](https://github.com/danielgindi/Charts/issues/3185)
+- PieChart `highlightValue\(x:y:dataSetIndex:\)` should provide error for dataSetIndex \> 1 [\#3146](https://github.com/danielgindi/Charts/issues/3146)
+- PieChart size is extremely small in a UITableViewCell [\#3108](https://github.com/danielgindi/Charts/issues/3108)
+- Handling critical Y values with autoScaleMinMaxEnabled [\#2053](https://github.com/danielgindi/Charts/issues/2053)
+- Charts 3.0 - Error: this application, or a library it uses, has passed an invalid numeric value \(NaN, or not-a-number\) to CoreGraphics API and this value is being ignored [\#1626](https://github.com/danielgindi/Charts/issues/1626)
+
+**Closed issues:**
+
+- Programatically passed renderer is corrupting animations [\#3349](https://github.com/danielgindi/Charts/issues/3349)
+- How to show Integer value [\#3346](https://github.com/danielgindi/Charts/issues/3346)
+- Does not build on Xcode 8.3.3 & Swift 3 [\#3341](https://github.com/danielgindi/Charts/issues/3341)
+- how to use pod 'Charts' into objective c project , i create header file to use swift , but what should i  do after create header file ?  [\#3338](https://github.com/danielgindi/Charts/issues/3338)
+- How to show all labels in xAxis ?  [\#3337](https://github.com/danielgindi/Charts/issues/3337)
+- How to set the interval in X axis label [\#3335](https://github.com/danielgindi/Charts/issues/3335)
+- Line chart with solid and dashed line [\#3334](https://github.com/danielgindi/Charts/issues/3334)
+- Code signing is required for product type 'Application' in SDK 'iOS 11.2' [\#3333](https://github.com/danielgindi/Charts/issues/3333)
+- My project within framework target and pod Charts into my framework target can't load Charts framework [\#3328](https://github.com/danielgindi/Charts/issues/3328)
+- Swift 4.1 compilation warnings [\#3323](https://github.com/danielgindi/Charts/issues/3323)
+- Two Horizontal grid lines always appear above Base Axis line [\#3322](https://github.com/danielgindi/Charts/issues/3322)
+- BalloonMarker support swift 3 ? [\#3321](https://github.com/danielgindi/Charts/issues/3321)
+- Unable to get horizontal scrolling in bar chart [\#3319](https://github.com/danielgindi/Charts/issues/3319)
+- Horizontal Bar Chart xAxis formatted label textColor [\#3317](https://github.com/danielgindi/Charts/issues/3317)
+- Wrong dataSetIndex in stringForValue delegate method [\#3314](https://github.com/danielgindi/Charts/issues/3314)
+- Limit line in the left and right drag or zoom can be fixed [\#3313](https://github.com/danielgindi/Charts/issues/3313)
+- Save picture crash in demos on iOS 11+ [\#3311](https://github.com/danielgindi/Charts/issues/3311)
+- How to display reload text in iOS-Charts? [\#3310](https://github.com/danielgindi/Charts/issues/3310)
+- Can't show Label text in XAxis [\#3308](https://github.com/danielgindi/Charts/issues/3308)
+- Straight lines [\#3306](https://github.com/danielgindi/Charts/issues/3306)
+- Values on X axis issue [\#3304](https://github.com/danielgindi/Charts/issues/3304)
+- when setInverted\(true\) in the leftAxis of CombinedChart, the candleStickData doesnot show ? [\#3303](https://github.com/danielgindi/Charts/issues/3303)
+- HorizontalBarChart X axe labels duplicated [\#3300](https://github.com/danielgindi/Charts/issues/3300)
+- how can i change label color? [\#3298](https://github.com/danielgindi/Charts/issues/3298)
+- value granularity [\#3296](https://github.com/danielgindi/Charts/issues/3296)
+- Better way to manage Stacked Bar Chart Value labels? [\#3295](https://github.com/danielgindi/Charts/issues/3295)
+- Remove Y axis border line in Line Graph [\#3294](https://github.com/danielgindi/Charts/issues/3294)
+- XAxisRenderer not called [\#3293](https://github.com/danielgindi/Charts/issues/3293)
+- How to display string value on xAxis label in line chart  [\#3292](https://github.com/danielgindi/Charts/issues/3292)
+- how to change the color of text that displayed below the chart ios swift 3 [\#3288](https://github.com/danielgindi/Charts/issues/3288)
+- color in BalloonMarker is never used [\#3287](https://github.com/danielgindi/Charts/issues/3287)
+- Question: LineChart variable line thickness? [\#3285](https://github.com/danielgindi/Charts/issues/3285)
+- Modify selected slice [\#3284](https://github.com/danielgindi/Charts/issues/3284)
+- Put shadow under slice [\#3283](https://github.com/danielgindi/Charts/issues/3283)
+- How can I take selected value index in Pie Chart [\#3282](https://github.com/danielgindi/Charts/issues/3282)
+- hide other label when one slice of pie chart was selected [\#3281](https://github.com/danielgindi/Charts/issues/3281)
+- How to show custom x and y axis details in LineChart in objective c ??? [\#3280](https://github.com/danielgindi/Charts/issues/3280)
+- I need to put dates from an array on xAxis [\#3277](https://github.com/danielgindi/Charts/issues/3277)
+- Is there a way to round the corners of the BalloonMarker? [\#3276](https://github.com/danielgindi/Charts/issues/3276)
+- Set values not showing until chart is zoomed [\#3275](https://github.com/danielgindi/Charts/issues/3275)
+- How to add gap between chart and legend? [\#3274](https://github.com/danielgindi/Charts/issues/3274)
+- LineChart : How to show the grid in right axis [\#3271](https://github.com/danielgindi/Charts/issues/3271)
+- How to custom axis' label in horizontal bar chart [\#3270](https://github.com/danielgindi/Charts/issues/3270)
+- LineChart: How to fix space between point on  xAxis [\#3269](https://github.com/danielgindi/Charts/issues/3269)
+- Line Chart Issue in CombinedChartView [\#3268](https://github.com/danielgindi/Charts/issues/3268)
+- LineChartRenderer - drawHighlighted:context:indices: [\#3267](https://github.com/danielgindi/Charts/issues/3267)
+- Scatter Bar Char - Plots on axis \(0,0\) partially visible [\#3266](https://github.com/danielgindi/Charts/issues/3266)
+- is it support the ios 7??? [\#3263](https://github.com/danielgindi/Charts/issues/3263)
+- Combined chart for candlestick + bar [\#3262](https://github.com/danielgindi/Charts/issues/3262)
+- setScatterShape applied to Legend also [\#3261](https://github.com/danielgindi/Charts/issues/3261)
+- ChartDataSet min and max values not recalculated when calling clear\(\)  [\#3260](https://github.com/danielgindi/Charts/issues/3260)
+- How to realize the Line and the bar Chart in the same one Chart? [\#3259](https://github.com/danielgindi/Charts/issues/3259)
+- '\_xBounds' and other variables inaccessible due to 'internal' protection level workaround [\#3258](https://github.com/danielgindi/Charts/issues/3258)
+- //view\_line\_graph.centerViewTo\(xValue: Double\(dataEntries\[pos\].x\)  , yValue:   Double\(dataEntries\[pos\].y\), axis: YAxis.AxisDependency.right\) [\#3257](https://github.com/danielgindi/Charts/issues/3257)
+- dyld: Library not loaded: @rpath/Charts.framework/Charts [\#3250](https://github.com/danielgindi/Charts/issues/3250)
+- X Axis disapeared [\#3249](https://github.com/danielgindi/Charts/issues/3249)
+- Save zoom state [\#3248](https://github.com/danielgindi/Charts/issues/3248)
+- leftAxis label bug? [\#3246](https://github.com/danielgindi/Charts/issues/3246)
+- x-axis label jumps when zoomed in and side scrolling. [\#3245](https://github.com/danielgindi/Charts/issues/3245)
+- avoidFirstLastClippingEnabled not working and set last circleColor a different value [\#3244](https://github.com/danielgindi/Charts/issues/3244)
+- Got totally 50 errors after install CocoaPods ..! I am using Swift 4.0 [\#3243](https://github.com/danielgindi/Charts/issues/3243)
+- Error in Library When added pod file [\#3242](https://github.com/danielgindi/Charts/issues/3242)
+- How to do  multiple  data on x axis? [\#3241](https://github.com/danielgindi/Charts/issues/3241)
+- Missing entries in PieChartDataEntry legends. [\#3240](https://github.com/danielgindi/Charts/issues/3240)
+- Candle Stick does not show [\#3239](https://github.com/danielgindi/Charts/issues/3239)
+- How i give LineChart Entry using x index and y value in Charts '3.0.4'? help wanted [\#3238](https://github.com/danielgindi/Charts/issues/3238)
+- ChartDataEntry with icons shows scatter shape at same time [\#3237](https://github.com/danielgindi/Charts/issues/3237)
+- HorizontalBarChart - Right axis label starts with the highest value up to the same value [\#3235](https://github.com/danielgindi/Charts/issues/3235)
+- Carthage Charts [\#3234](https://github.com/danielgindi/Charts/issues/3234)
+- 3.0.5 Bar chart xAxis valueFormatter regression - no data points shown. [\#3233](https://github.com/danielgindi/Charts/issues/3233)
+- Pin the graph on one side while zooming [\#3232](https://github.com/danielgindi/Charts/issues/3232)
+- yAxisMaximum auto-increment RadarChartView [\#3231](https://github.com/danielgindi/Charts/issues/3231)
+- Compile issue after install pod 'Chart' [\#3230](https://github.com/danielgindi/Charts/issues/3230)
+- corner line chart [\#3227](https://github.com/danielgindi/Charts/issues/3227)
+- Make specific pieChart segment stick out and go back to normal size, animated [\#3224](https://github.com/danielgindi/Charts/issues/3224)
+- Dash line and highlighted top value [\#3221](https://github.com/danielgindi/Charts/issues/3221)
+- Why is the xAxis Value Formater so often called? [\#3220](https://github.com/danielgindi/Charts/issues/3220)
+- How easy is to add some technical indicators? [\#3219](https://github.com/danielgindi/Charts/issues/3219)
+- How to set X-Axis data to bottom of chart with strings data? [\#3212](https://github.com/danielgindi/Charts/issues/3212)
+- how to drag the LineChartView [\#3211](https://github.com/danielgindi/Charts/issues/3211)
+- Release 3.0.5 contains version number inconsistencies [\#3210](https://github.com/danielgindi/Charts/issues/3210)
+- Unable to Hide PieChart Legends.  [\#3209](https://github.com/danielgindi/Charts/issues/3209)
+- Recent release with my Swift3 project [\#3208](https://github.com/danielgindi/Charts/issues/3208)
+- Cannot set double value in Combined chart line chart. [\#3205](https://github.com/danielgindi/Charts/issues/3205)
+- Bar charts with different column widths [\#3204](https://github.com/danielgindi/Charts/issues/3204)
+- Labels on x-axes not linked to chart data points [\#3203](https://github.com/danielgindi/Charts/issues/3203)
+- Remark: The AppCoda tutorial is outdated [\#3196](https://github.com/danielgindi/Charts/issues/3196)
+- Unable to set strings as values in x axis of linechart [\#3195](https://github.com/danielgindi/Charts/issues/3195)
+- drag event issie [\#3194](https://github.com/danielgindi/Charts/issues/3194)
+- Custom XAxisRenderer labels are shifting around when scrolling [\#3193](https://github.com/danielgindi/Charts/issues/3193)
+- How to asynchronous drawings LineChart? [\#3192](https://github.com/danielgindi/Charts/issues/3192)
+- How do I listen to the left or right to the end of the event when I zoom in on the lineCharts? [\#3184](https://github.com/danielgindi/Charts/issues/3184)
+- Want to delete color set beside legend label [\#3180](https://github.com/danielgindi/Charts/issues/3180)
+- How to show/hide Stacked Bar Chart yValue? [\#3175](https://github.com/danielgindi/Charts/issues/3175)
+- Readme needs to be updated for 3.0.5 [\#3170](https://github.com/danielgindi/Charts/issues/3170)
+- Add Axis description to Charts Framework [\#3168](https://github.com/danielgindi/Charts/issues/3168)
+- ChartViewDelegate not called when barChart is out of screen [\#3165](https://github.com/danielgindi/Charts/issues/3165)
+- dash line \(separators\) in between in bars. [\#3163](https://github.com/danielgindi/Charts/issues/3163)
+- StackedBarChart Value on middle of each stacked bar chart  [\#3162](https://github.com/danielgindi/Charts/issues/3162)
+- ChartLimitLine Label Position [\#3161](https://github.com/danielgindi/Charts/issues/3161)
+- bar chat  [\#3158](https://github.com/danielgindi/Charts/issues/3158)
+- Bar coloring [\#3157](https://github.com/danielgindi/Charts/issues/3157)
+- HorizontalBarChart doesn't display bar draw values when bar is partially off ViewPort [\#3155](https://github.com/danielgindi/Charts/issues/3155)
+- X-Axis Labels not showing [\#3154](https://github.com/danielgindi/Charts/issues/3154)
+- How to make highlight scrolling on chart not trigger parent scrollView? \[help\] [\#3153](https://github.com/danielgindi/Charts/issues/3153)
+- How to fill the color like the marked part of this following picture? Thanks a lot! [\#3144](https://github.com/danielgindi/Charts/issues/3144)
+- finger leaves the chart area [\#3128](https://github.com/danielgindi/Charts/issues/3128)
+- Technical Support in Github [\#3126](https://github.com/danielgindi/Charts/issues/3126)
+- Plotting the bar from top to bottom \(in reverse manner\) [\#3125](https://github.com/danielgindi/Charts/issues/3125)
+- pieChart Data name overlap [\#3109](https://github.com/danielgindi/Charts/issues/3109)
+- LineChart with different colors based on values. [\#3107](https://github.com/danielgindi/Charts/issues/3107)
+- AxisBase Value Formatter [\#3105](https://github.com/danielgindi/Charts/issues/3105)
+- Multiple charts in same view [\#3103](https://github.com/danielgindi/Charts/issues/3103)
+- Draw dotted x-axis timeline [\#3102](https://github.com/danielgindi/Charts/issues/3102)
+- PieChart value labels are overlaping when values are between 0 to 9 [\#2948](https://github.com/danielgindi/Charts/issues/2948)
+- xValues on X-Axis for non-continuous dates [\#2398](https://github.com/danielgindi/Charts/issues/2398)
+- y-labels position is wrong，when i set autoScaleMinMaxEnabled = YES [\#2379](https://github.com/danielgindi/Charts/issues/2379)
+- Distance between chart legend and the horizontal bar chart is to big in case of rotated labels [\#2138](https://github.com/danielgindi/Charts/issues/2138)
+- How to set LabelCount bigger than 25 in HorizatalBarView [\#2085](https://github.com/danielgindi/Charts/issues/2085)
+
+**Merged pull requests:**
+
+- bump to 3.1 release [\#3357](https://github.com/danielgindi/Charts/pull/3357) ([liuxuan30](https://github.com/liuxuan30))
+- Refactors -\[tableView:cellForRowAtIndexPath:\] [\#3326](https://github.com/danielgindi/Charts/pull/3326) ([valeriyvan](https://github.com/valeriyvan))
+- minor bug fix in favor of 3.1 release [\#3312](https://github.com/danielgindi/Charts/pull/3312) ([liuxuan30](https://github.com/liuxuan30))
+- add pie chart unit tests [\#3297](https://github.com/danielgindi/Charts/pull/3297) ([liuxuan30](https://github.com/liuxuan30))
+- Align Objc and Swift demos balloon marker [\#3291](https://github.com/danielgindi/Charts/pull/3291) ([liuxuan30](https://github.com/liuxuan30))
+- for \#3146. add a warning message if pie chart has more than one data set [\#3286](https://github.com/danielgindi/Charts/pull/3286) ([liuxuan30](https://github.com/liuxuan30))
+- Issue templates [\#3278](https://github.com/danielgindi/Charts/pull/3278) ([jjatie](https://github.com/jjatie))
+- Min and Max reset when clearing ChartDataSet \(Fixes \#3260\) [\#3265](https://github.com/danielgindi/Charts/pull/3265) ([carlo-](https://github.com/carlo-))
+- Restored old performance in ChartDataSet [\#3216](https://github.com/danielgindi/Charts/pull/3216) ([jjatie](https://github.com/jjatie))
+- Support other bundle than main MarkerView.viewFromXib\(\) [\#3215](https://github.com/danielgindi/Charts/pull/3215) ([charlymr](https://github.com/charlymr))
+- BubbleChart uses correct colour for index now. [\#3202](https://github.com/danielgindi/Charts/pull/3202) ([jjatie](https://github.com/jjatie))
+- Added custom text alignment for noData [\#3199](https://github.com/danielgindi/Charts/pull/3199) ([jjatie](https://github.com/jjatie))
+- Call setNeedsDisplay\(\) to trigger render noDataText [\#3198](https://github.com/danielgindi/Charts/pull/3198) ([liuxuan30](https://github.com/liuxuan30))
+- Updated README for 3.0.5 [\#3183](https://github.com/danielgindi/Charts/pull/3183) ([jjatie](https://github.com/jjatie))
+- Balloon Marker indicates position of data [\#3181](https://github.com/danielgindi/Charts/pull/3181) ([jjatie](https://github.com/jjatie))
+- Fixed a duplicated assignment compared with obj-c code. [\#3179](https://github.com/danielgindi/Charts/pull/3179) ([canapio](https://github.com/canapio))
+- Fixed X-Axis Labels Not Showing \(\#3154\) [\#3174](https://github.com/danielgindi/Charts/pull/3174) ([leedsalex](https://github.com/leedsalex))
+- fix programatical unhighlighting for BarCharView [\#3159](https://github.com/danielgindi/Charts/pull/3159) ([jekahy](https://github.com/jekahy))
+- Removed optionality from valueFormatter where appropriate [\#3106](https://github.com/danielgindi/Charts/pull/3106) ([jjatie](https://github.com/jjatie))
+- Moved the default value formatter [\#3088](https://github.com/danielgindi/Charts/pull/3088) ([jjatie](https://github.com/jjatie))
+- Utils Cleanup [\#3054](https://github.com/danielgindi/Charts/pull/3054) ([jjatie](https://github.com/jjatie))
+- weak -\> unowned [\#3039](https://github.com/danielgindi/Charts/pull/3039) ([jjatie](https://github.com/jjatie))
+- Fix BalloonMarker's text position calculation, consider insets [\#3035](https://github.com/danielgindi/Charts/pull/3035) ([yangcaimu](https://github.com/yangcaimu))
+- Chartdata collection refactor [\#3024](https://github.com/danielgindi/Charts/pull/3024) ([jjatie](https://github.com/jjatie))
+- Chartdata collection conformance [\#3023](https://github.com/danielgindi/Charts/pull/3023) ([jjatie](https://github.com/jjatie))
+- Give the users customizable axis label limits \(Fixes \#2085\) [\#2894](https://github.com/danielgindi/Charts/pull/2894) ([igzrobertoestrada](https://github.com/igzrobertoestrada))
+- For \#2840. add dataIndex parameter in `highlightValue\(\)` calls [\#2852](https://github.com/danielgindi/Charts/pull/2852) ([liuxuan30](https://github.com/liuxuan30))
+- fix \#2356 crash if floor\(10.0 \* intervalMagnitude\) is 0.0 [\#2377](https://github.com/danielgindi/Charts/pull/2377) ([liuxuan30](https://github.com/liuxuan30))
+- Fixes the distance issue between the legend and the horizontal bar chart \(Fixes \#2138\) [\#2214](https://github.com/danielgindi/Charts/pull/2214) ([SvenMuc](https://github.com/SvenMuc))
+
+## [3.0.5](https://github.com/danielgindi/Charts/tree/3.0.5) (2018-01-08)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.0.5...3.0.5)
+
+## [v3.0.5](https://github.com/danielgindi/Charts/tree/v3.0.5) (2018-01-08)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.0.4...v3.0.5)
+
+**Implemented enhancements:**
+
+- range, and therefore interval, is NaN in computeAxisValues [\#2845](https://github.com/danielgindi/Charts/issues/2845)
+- Crash when calling `func highlightValue\(x: Double, dataSetIndex: Int, callDelegate: Bool\)` [\#2840](https://github.com/danielgindi/Charts/issues/2840)
+
+**Fixed bugs:**
+
+- Combined Chart, when highlight is active, bars hides line [\#3091](https://github.com/danielgindi/Charts/issues/3091)
+- A problem of CombinedChartView's YAxis [\#1830](https://github.com/danielgindi/Charts/issues/1830)
+
+**Closed issues:**
+
+- Command /bin/sh failed with exit code 1 [\#3156](https://github.com/danielgindi/Charts/issues/3156)
+- Xcode 9 / Swift 4 issue with current master [\#3152](https://github.com/danielgindi/Charts/issues/3152)
+- Is it possible to show value on touch next to highlight position? [\#3151](https://github.com/danielgindi/Charts/issues/3151)
+- Remove legend [\#3150](https://github.com/danielgindi/Charts/issues/3150)
+- Add a shadow to the line chart [\#3148](https://github.com/danielgindi/Charts/issues/3148)
+- Missing alternate x-axis labels on line chart [\#3139](https://github.com/danielgindi/Charts/issues/3139)
+- Can the histogram set the corner？ [\#3138](https://github.com/danielgindi/Charts/issues/3138)
+- Charts demo ipa file request [\#3137](https://github.com/danielgindi/Charts/issues/3137)
+- Main Thread Checker: UI API called on background thread. [\#3129](https://github.com/danielgindi/Charts/issues/3129)
+- How to get X\_axis touch points coordinates in radar graph [\#3127](https://github.com/danielgindi/Charts/issues/3127)
+- Division by zero crash in AxisRendererBase [\#3124](https://github.com/danielgindi/Charts/issues/3124)
+- why bar chart non start at zero [\#3123](https://github.com/danielgindi/Charts/issues/3123)
+- BarChart - Show X-Axis with Step as 1 [\#3122](https://github.com/danielgindi/Charts/issues/3122)
+- Have Line Graph Value Labels Above/Below Independently [\#3120](https://github.com/danielgindi/Charts/issues/3120)
+- Corner Radius on Grid Background [\#3119](https://github.com/danielgindi/Charts/issues/3119)
+- ChartsDemo doesn't compile [\#3116](https://github.com/danielgindi/Charts/issues/3116)
+- Rounded line chart [\#3115](https://github.com/danielgindi/Charts/issues/3115)
+- value of barChart covered by title [\#3113](https://github.com/danielgindi/Charts/issues/3113)
+- PieChartView Can not highlight which i want to highlighted [\#3110](https://github.com/danielgindi/Charts/issues/3110)
+- How to scroll bar chart if max values to show? [\#3101](https://github.com/danielgindi/Charts/issues/3101)
+- Is it possible to draw a chart like this? [\#3097](https://github.com/danielgindi/Charts/issues/3097)
+- How to disable the rotation option of pie charts in iOS charts? [\#3096](https://github.com/danielgindi/Charts/issues/3096)
+- How to disable the rotation option of pie charts in iOS charts? [\#3095](https://github.com/danielgindi/Charts/issues/3095)
+- 数据空值处理问题 [\#3094](https://github.com/danielgindi/Charts/issues/3094)
+- how to display the integer values on pie chart instead of float? [\#3093](https://github.com/danielgindi/Charts/issues/3093)
+- Line Chart point colours depend on value at each point [\#3090](https://github.com/danielgindi/Charts/issues/3090)
+- how to cancel highlights when the drag gesture ends [\#3089](https://github.com/danielgindi/Charts/issues/3089)
+- why my value is .50 ？Why not 0.5？ How to do? [\#3083](https://github.com/danielgindi/Charts/issues/3083)
+- how to use String in YAxis， rather than Double? [\#3082](https://github.com/danielgindi/Charts/issues/3082)
+- Scrolling axis [\#3081](https://github.com/danielgindi/Charts/issues/3081)
+- Clipping of values in line graph [\#3077](https://github.com/danielgindi/Charts/issues/3077)
+- \[LineChart\] Ignore / don't plot first or end value [\#3075](https://github.com/danielgindi/Charts/issues/3075)
+- Which attribute control the yellow line，like the picture？ [\#3074](https://github.com/danielgindi/Charts/issues/3074)
+- Archive error using swift 4.0 [\#3072](https://github.com/danielgindi/Charts/issues/3072)
+- How can I have a chart like this one? [\#3070](https://github.com/danielgindi/Charts/issues/3070)
+- Module compiled with Swift 4.0 cannot be imported in Swift 3.2.3 [\#3068](https://github.com/danielgindi/Charts/issues/3068)
+- Unable to make chart look like IOS Stock App after trying every mode \(LineChartModeLinear = 0,   LineChartModeStepped = 1,   LineChartModeCubicBezier = 2,   LineChartModeHorizontalBezier = 3\) of LineChartDataSet [\#3066](https://github.com/danielgindi/Charts/issues/3066)
+- Cannot Select barChar column [\#3065](https://github.com/danielgindi/Charts/issues/3065)
+- Updating data in LineChart takes up to 30 seconds [\#3064](https://github.com/danielgindi/Charts/issues/3064)
+- How to sync the scrolling of 2 charts  [\#3063](https://github.com/danielgindi/Charts/issues/3063)
+- Line chart with bottom spacing and custom position y-labels at min and max values [\#3059](https://github.com/danielgindi/Charts/issues/3059)
+- 'characters' is deprecated: Please use String or Substring directly [\#3057](https://github.com/danielgindi/Charts/issues/3057)
+- Pod to OC error [\#3053](https://github.com/danielgindi/Charts/issues/3053)
+- How to represent a null value，It's like the picture? not 0 [\#3052](https://github.com/danielgindi/Charts/issues/3052)
+- dyld library not loaded @rpath/charts.framework/charts reason : image not found XCode 9.1 MacOS version 10.12.6 [\#3050](https://github.com/danielgindi/Charts/issues/3050)
+- Can't change the border width of circle point in line chart. [\#3049](https://github.com/danielgindi/Charts/issues/3049)
+- Charts library is not working in Swift 4 Xcode 9 [\#3048](https://github.com/danielgindi/Charts/issues/3048)
+- Create an image of the entire chart [\#3037](https://github.com/danielgindi/Charts/issues/3037)
+- lineChartView only enables one data set to be with icons [\#3036](https://github.com/danielgindi/Charts/issues/3036)
+- Add charts to UIView programatically [\#3033](https://github.com/danielgindi/Charts/issues/3033)
+- Only disable animation for adding values [\#3031](https://github.com/danielgindi/Charts/issues/3031)
+- BarChartDataSet with only negative values doesn't call stringForValue on formatter [\#3030](https://github.com/danielgindi/Charts/issues/3030)
+- Please provide an example for pieradarchart [\#3029](https://github.com/danielgindi/Charts/issues/3029)
+- Multiple charts in a collection view [\#3028](https://github.com/danielgindi/Charts/issues/3028)
+- Bubbles chart   [\#3027](https://github.com/danielgindi/Charts/issues/3027)
+- delete [\#3025](https://github.com/danielgindi/Charts/issues/3025)
+- How to change position xAxis Label on the Top Bar Chart ? [\#3022](https://github.com/danielgindi/Charts/issues/3022)
+- How to decrease space between chartData ? Is there any parameter ? [\#3021](https://github.com/danielgindi/Charts/issues/3021)
+- 已解决 [\#3020](https://github.com/danielgindi/Charts/issues/3020)
+- Drawing min mix median lines [\#3017](https://github.com/danielgindi/Charts/issues/3017)
+- Installation error through cocapods [\#3016](https://github.com/danielgindi/Charts/issues/3016)
+- Swift 4.0.2 not compatible [\#3015](https://github.com/danielgindi/Charts/issues/3015)
+- Error NSAttributedStringKey.font on Xcode 9.1 Swift 4 with Charts \(3.0.4\) [\#3014](https://github.com/danielgindi/Charts/issues/3014)
+- Double Bar Lines [\#3013](https://github.com/danielgindi/Charts/issues/3013)
+- Same zero line for left and right axis [\#3011](https://github.com/danielgindi/Charts/issues/3011)
+- How to get version 3.0.2 ? [\#3009](https://github.com/danielgindi/Charts/issues/3009)
+- How can I scroll to previous data? [\#3006](https://github.com/danielgindi/Charts/issues/3006)
+- Crashing in X-axis render method. [\#3004](https://github.com/danielgindi/Charts/issues/3004)
+- How to align yAxis at zero point? [\#2989](https://github.com/danielgindi/Charts/issues/2989)
+- Line Chart View not drawn because Date values in xAxis \(not sorted Ascending/Descending\) ? [\#2988](https://github.com/danielgindi/Charts/issues/2988)
+- Showing .0, .00 accoding the the decimal places insted of 0 in graphs [\#2987](https://github.com/danielgindi/Charts/issues/2987)
+- How to select one of them in the first time。 [\#2985](https://github.com/danielgindi/Charts/issues/2985)
+- 当饼状图的数据为0%的时候,左下角有个多余的字母N,问题已解决,有遇到这个问题的请私聊我 [\#2984](https://github.com/danielgindi/Charts/issues/2984)
+- Scale to particular x-axis range in line chart [\#2979](https://github.com/danielgindi/Charts/issues/2979)
+- ChartViewDelegate [\#2978](https://github.com/danielgindi/Charts/issues/2978)
+- What is the compatible version with Xcode 8.3.3 ? [\#2977](https://github.com/danielgindi/Charts/issues/2977)
+- ScatterChartDataSet troubles with alignments. [\#2976](https://github.com/danielgindi/Charts/issues/2976)
+- Uneven X-Axis values for a line chart [\#2975](https://github.com/danielgindi/Charts/issues/2975)
+- Stacked bar chart value label clipped  [\#2974](https://github.com/danielgindi/Charts/issues/2974)
+- Pie chart monochrome or gradient fill not support  [\#2973](https://github.com/danielgindi/Charts/issues/2973)
+- PieChart:- PieChart not completely show.  [\#2972](https://github.com/danielgindi/Charts/issues/2972)
+- Error after updating to Xcode 9.1 [\#2970](https://github.com/danielgindi/Charts/issues/2970)
+- Add cornerRadius to vertical highlighter line and draw circle only on highlight [\#2969](https://github.com/danielgindi/Charts/issues/2969)
+- How can I don't draw lines when data absent at some point? [\#2968](https://github.com/danielgindi/Charts/issues/2968)
+- How to use your file directly to my project without pod installation? [\#2964](https://github.com/danielgindi/Charts/issues/2964)
+- Line chart lines are clipped [\#2963](https://github.com/danielgindi/Charts/issues/2963)
+- Marker with multiple datasets [\#2962](https://github.com/danielgindi/Charts/issues/2962)
+- how do i run it in xcode 9??  [\#2958](https://github.com/danielgindi/Charts/issues/2958)
+- Regarding Xcode version [\#2957](https://github.com/danielgindi/Charts/issues/2957)
+- Cannot align chart description on left instead of right [\#2956](https://github.com/danielgindi/Charts/issues/2956)
+- change color of bar chart programmatically ?  [\#2954](https://github.com/danielgindi/Charts/issues/2954)
+- Remove or change line color in chart [\#2953](https://github.com/danielgindi/Charts/issues/2953)
+- Show line bar position per seconds  [\#2952](https://github.com/danielgindi/Charts/issues/2952)
+- Add Two Custom Marker views on linechart graph [\#2951](https://github.com/danielgindi/Charts/issues/2951)
+- Display high and low value in chart but Displayed one only [\#2947](https://github.com/danielgindi/Charts/issues/2947)
+- Change LineChartDataSet label color not value color. [\#2944](https://github.com/danielgindi/Charts/issues/2944)
+- when dataset value is increases then the graph value is misplace . and i am showing three bar in one group. and also show the  integer value in particular bar above. [\#2938](https://github.com/danielgindi/Charts/issues/2938)
+- Errors after conversion to Swift4 NSAttributedStringKey [\#2937](https://github.com/danielgindi/Charts/issues/2937)
+- xAxis setLabelsToSkip and valuesObjc want to have replace api [\#2936](https://github.com/danielgindi/Charts/issues/2936)
+- xAxis value is started with 0 but it not coordinate with y axis 0 value [\#2935](https://github.com/danielgindi/Charts/issues/2935)
+- line charts with many gradients according the value [\#2934](https://github.com/danielgindi/Charts/issues/2934)
+- Xcode 9.1 - Characters is deprecated [\#2933](https://github.com/danielgindi/Charts/issues/2933)
+- How to add corner radius to balloonmarker [\#2932](https://github.com/danielgindi/Charts/issues/2932)
+- leftAxis and rightAxis didn't show up [\#2931](https://github.com/danielgindi/Charts/issues/2931)
+- Errors when importing BalloonMarker [\#2928](https://github.com/danielgindi/Charts/issues/2928)
+- Bar chart does not start at zero. [\#2927](https://github.com/danielgindi/Charts/issues/2927)
+- The following binaries use incompatible versions of Swift [\#2926](https://github.com/danielgindi/Charts/issues/2926)
+-  Change the color of a specific X-Axis label and the corresponding data value in a line chart using Charts framework [\#2925](https://github.com/danielgindi/Charts/issues/2925)
+- Adding corner radius on top of Bar [\#2924](https://github.com/danielgindi/Charts/issues/2924)
+- I want to change colour of the label text on the x-axis where it's highlighted. [\#2923](https://github.com/danielgindi/Charts/issues/2923)
+- How to give Gradient colour for limit line in linechartviewDataSet  [\#2922](https://github.com/danielgindi/Charts/issues/2922)
+- Gradient colour for stroke line horizantally .It is possible in  android  [\#2921](https://github.com/danielgindi/Charts/issues/2921)
+- y axis range not automatically recalculated when adding entry to data set [\#2920](https://github.com/danielgindi/Charts/issues/2920)
+- Build framework from project [\#2919](https://github.com/danielgindi/Charts/issues/2919)
+- How to draw a diagram above the axis labels? [\#2918](https://github.com/danielgindi/Charts/issues/2918)
+- - [\#2917](https://github.com/danielgindi/Charts/issues/2917)
+- How to use IValueFormatter in stacked bar chart [\#2916](https://github.com/danielgindi/Charts/issues/2916)
+- Use of unresolved identifier NSAttributedStringKey in Xcode 8.3.2 for swift 3 [\#2915](https://github.com/danielgindi/Charts/issues/2915)
+- Barchart with rounded bar style [\#2912](https://github.com/danielgindi/Charts/issues/2912)
+- Animate adding single point [\#2911](https://github.com/danielgindi/Charts/issues/2911)
+- Crash [\#2910](https://github.com/danielgindi/Charts/issues/2910)
+- Multi Window [\#2909](https://github.com/danielgindi/Charts/issues/2909)
+- how can I unhighlight any slice selected before in PieChart ? [\#2908](https://github.com/danielgindi/Charts/issues/2908)
+- Barchart DefaultValueFormatter dataSetIndex always 0 [\#2907](https://github.com/danielgindi/Charts/issues/2907)
+- LineChartDataSet Multi color [\#2906](https://github.com/danielgindi/Charts/issues/2906)
+- How to disconnect data points?  [\#2905](https://github.com/danielgindi/Charts/issues/2905)
+- Licensing question [\#2904](https://github.com/danielgindi/Charts/issues/2904)
+- A way to add values to labels on x axis? [\#2903](https://github.com/danielgindi/Charts/issues/2903)
+- Update cocoapods.org version [\#2902](https://github.com/danielgindi/Charts/issues/2902)
+- noDataText for PieChartView isn't working. [\#2901](https://github.com/danielgindi/Charts/issues/2901)
+- xcode9 alert swift question [\#2900](https://github.com/danielgindi/Charts/issues/2900)
+- Dynamically set the bar width [\#2898](https://github.com/danielgindi/Charts/issues/2898)
+- Marker action [\#2897](https://github.com/danielgindi/Charts/issues/2897)
+- Filler line for acceptable range of values in LineChart [\#2896](https://github.com/danielgindi/Charts/issues/2896)
+- Pie chart full view [\#2895](https://github.com/danielgindi/Charts/issues/2895)
+- Problem with BalloonMarker in lineChart [\#2892](https://github.com/danielgindi/Charts/issues/2892)
+- OS X Bar chart Demo highlight and stacked color are inconsistent [\#2890](https://github.com/danielgindi/Charts/issues/2890)
+- Problem with charts in UITableView cells [\#2888](https://github.com/danielgindi/Charts/issues/2888)
+- drawing xAxis ratio values [\#2885](https://github.com/danielgindi/Charts/issues/2885)
+- Xcode 9 compatibility [\#2883](https://github.com/danielgindi/Charts/issues/2883)
+- Large Whitespace Between X-Axis Labels and Legend [\#2882](https://github.com/danielgindi/Charts/issues/2882)
+- help about performance issues about line charts [\#2881](https://github.com/danielgindi/Charts/issues/2881)
+- Animation on PieChartView [\#2880](https://github.com/danielgindi/Charts/issues/2880)
+- Scrolling chart after setting lineChart.xAxis.axisMaximum = someValue [\#2879](https://github.com/danielgindi/Charts/issues/2879)
+- "chartValueSelected" is not getting called in customView [\#2878](https://github.com/danielgindi/Charts/issues/2878)
+- curve line [\#2877](https://github.com/danielgindi/Charts/issues/2877)
+- Swift 4 issue [\#2876](https://github.com/danielgindi/Charts/issues/2876)
+- 不显示百分号了 [\#2873](https://github.com/danielgindi/Charts/issues/2873)
+- LineChartView: Using two different colors in one dataset [\#2871](https://github.com/danielgindi/Charts/issues/2871)
+- xcode 9.0 errors after installing pod 'Charts' [\#2869](https://github.com/danielgindi/Charts/issues/2869)
+- Change scroll direction HorizontalBarChartView x-axis from top to bottom chart [\#2868](https://github.com/danielgindi/Charts/issues/2868)
+- Set names of X-axis and Y-axis itself \(not their labels\) [\#2867](https://github.com/danielgindi/Charts/issues/2867)
+- 'characters' is deprecated: Please use String or Substring directly [\#2866](https://github.com/danielgindi/Charts/issues/2866)
+- Syntax error in pod [\#2865](https://github.com/danielgindi/Charts/issues/2865)
+- Filled Line Chart [\#2863](https://github.com/danielgindi/Charts/issues/2863)
+- How can I highlight a specific slice of the PieChart? [\#2862](https://github.com/danielgindi/Charts/issues/2862)
+- How can I make the chart rotate completely, 360, 720 on a button click ? [\#2861](https://github.com/danielgindi/Charts/issues/2861)
+- How can I make the chart rotate completely, 360, 720 on a button click ? [\#2860](https://github.com/danielgindi/Charts/issues/2860)
+- xcode9 pod install have a problem [\#2856](https://github.com/danielgindi/Charts/issues/2856)
+- can I implement stacked bar with rounded corners ? [\#2855](https://github.com/danielgindi/Charts/issues/2855)
+- Updating Charts to 3.0.4 and Swift 4 doesn't work [\#2851](https://github.com/danielgindi/Charts/issues/2851)
+- How to add string labels to XAxis horizontal bar in Charts framework\(swift 3\) [\#2850](https://github.com/danielgindi/Charts/issues/2850)
+- How to show off numbers in HorizontalBar [\#2849](https://github.com/danielgindi/Charts/issues/2849)
+- In Multiple bar chart Unable to set Values more than 4 bar in under given year.. [\#2847](https://github.com/danielgindi/Charts/issues/2847)
+- Type 'NSAttributedStringKey' \(aka 'NSString'\) has no member 'font' [\#2844](https://github.com/danielgindi/Charts/issues/2844)
+- Install charts via cocapods pulls back old version 3.0.2 [\#2843](https://github.com/danielgindi/Charts/issues/2843)
+- xcode 9.0 compile ERROR: "static var 'defaultFormatter' is not public" [\#2842](https://github.com/danielgindi/Charts/issues/2842)
+- Pass String to LineChartData [\#2841](https://github.com/danielgindi/Charts/issues/2841)
+- Customised graph with ranges\(Normal-blue and Warning-yellow\) also with it's legend [\#2838](https://github.com/danielgindi/Charts/issues/2838)
+- using UIGraphicsGetCurrentContext in MarkerImage subclass [\#2835](https://github.com/danielgindi/Charts/issues/2835)
+- How to show BarChartDataSet with descending x values? [\#2834](https://github.com/danielgindi/Charts/issues/2834)
+- getTransformer function doesn't work properly when AxisDependency is set to right [\#2833](https://github.com/danielgindi/Charts/issues/2833)
+- Grouped Bar chart X-axis and Bar Alignment [\#2832](https://github.com/danielgindi/Charts/issues/2832)
+- How to create a custom Marker from Xib - Swift [\#2831](https://github.com/danielgindi/Charts/issues/2831)
+- does not support new Objective-C project with Xcode 9 [\#2830](https://github.com/danielgindi/Charts/issues/2830)
+- radarChart default labelCount [\#2829](https://github.com/danielgindi/Charts/issues/2829)
+- NSDecimalNumber instead of Double [\#2828](https://github.com/danielgindi/Charts/issues/2828)
+- LineChart 填充 [\#2825](https://github.com/danielgindi/Charts/issues/2825)
+- Swift: Different colours for circles in one LineChartDataSet [\#2824](https://github.com/danielgindi/Charts/issues/2824)
+- Unable to update Chart library  [\#2823](https://github.com/danielgindi/Charts/issues/2823)
+- xMin, xMax, yMin, yMax not recalculated to zero on .clear\(\) [\#2822](https://github.com/danielgindi/Charts/issues/2822)
+- OS X errors with swift 4  [\#2819](https://github.com/danielgindi/Charts/issues/2819)
+- I want to add marker image from line chart in swift 4.0 [\#2818](https://github.com/danielgindi/Charts/issues/2818)
+- ChartMarkerView not able to subclass of swift class  [\#2817](https://github.com/danielgindi/Charts/issues/2817)
+- Type 'NSAttributedStringKey' \(aka 'NSString'\) has no member 'font' [\#2816](https://github.com/danielgindi/Charts/issues/2816)
+- StackedBarChart isn't stacking bars [\#2815](https://github.com/danielgindi/Charts/issues/2815)
+- Cocoapod 3.0.4 [\#2814](https://github.com/danielgindi/Charts/issues/2814)
+- Error aplication Thread in ios 11 with version 3.0.4 [\#2812](https://github.com/danielgindi/Charts/issues/2812)
+- Cannot compile with version 3.0.3 and Xcode 9 due to incompatible Swift version [\#2810](https://github.com/danielgindi/Charts/issues/2810)
+- I have the version 3.0.4 but when compile project I has an error [\#2809](https://github.com/danielgindi/Charts/issues/2809)
+- 拖动的时候 会强烈抖动 [\#2808](https://github.com/danielgindi/Charts/issues/2808)
+- Version 3.0.4 doesn't appear via Cocoapods [\#2807](https://github.com/danielgindi/Charts/issues/2807)
+- Bump Pod Version [\#2805](https://github.com/danielgindi/Charts/issues/2805)
+- module 'Charts' not found when dray it into target [\#2803](https://github.com/danielgindi/Charts/issues/2803)
+- How to get y-axis values "Int" to "Double" [\#2799](https://github.com/danielgindi/Charts/issues/2799)
+- The line chart enlarged is crash [\#2797](https://github.com/danielgindi/Charts/issues/2797)
+- How to change the entrylabel\(i.e, 90%\) color in PieChart [\#2794](https://github.com/danielgindi/Charts/issues/2794)
+- Chart Grid Lines Don't Always Draw [\#2791](https://github.com/danielgindi/Charts/issues/2791)
+- Charts.framework: No such file or directory [\#2789](https://github.com/danielgindi/Charts/issues/2789)
+- Memory Leak in Horizontal Bar Chart [\#2745](https://github.com/danielgindi/Charts/issues/2745)
+- axisDependency does not work [\#2258](https://github.com/danielgindi/Charts/issues/2258)
+- HorizontalBarChart does not update labels correctly [\#2257](https://github.com/danielgindi/Charts/issues/2257)
+
+**Merged pull requests:**
+
+- Syncing 4.0.0 with master [\#3160](https://github.com/danielgindi/Charts/pull/3160) ([jjatie](https://github.com/jjatie))
+- Subclassing of LegendRenderer didn't take any effect [\#3149](https://github.com/danielgindi/Charts/pull/3149) ([l-lemesev](https://github.com/l-lemesev))
+- Update ViewPortHandler.swift [\#3143](https://github.com/danielgindi/Charts/pull/3143) ([ParkinWu](https://github.com/ParkinWu))
+- Renderer protocols [\#3136](https://github.com/danielgindi/Charts/pull/3136) ([jjatie](https://github.com/jjatie))
+- Update 4.0.0 with master [\#3135](https://github.com/danielgindi/Charts/pull/3135) ([jjatie](https://github.com/jjatie))
+- Fix axis label disappear when zooming in deep enough [\#3132](https://github.com/danielgindi/Charts/pull/3132) ([liuxuan30](https://github.com/liuxuan30))
+- Updating 4.0.0 with latest changes in master [\#3130](https://github.com/danielgindi/Charts/pull/3130) ([jjatie](https://github.com/jjatie))
+- add option to build demo projects unit tests on iOS [\#3121](https://github.com/danielgindi/Charts/pull/3121) ([liuxuan30](https://github.com/liuxuan30))
+- Makes ChartsDemo compiling again [\#3117](https://github.com/danielgindi/Charts/pull/3117) ([valeriyvan](https://github.com/valeriyvan))
+- Fixed using wrong axis \(Issue \#2257\) [\#3114](https://github.com/danielgindi/Charts/pull/3114) ([defranke](https://github.com/defranke))
+- for \#3061 fix animation crash [\#3098](https://github.com/danielgindi/Charts/pull/3098) ([liuxuan30](https://github.com/liuxuan30))
+- Refactored ChartUtils method into CGPoint extension [\#3087](https://github.com/danielgindi/Charts/pull/3087) ([jjatie](https://github.com/jjatie))
+- Moved ChartUtils drawing methods into CGContext extension [\#3086](https://github.com/danielgindi/Charts/pull/3086) ([jjatie](https://github.com/jjatie))
+- for \#2745. chart should be weak. [\#3078](https://github.com/danielgindi/Charts/pull/3078) ([liuxuan30](https://github.com/liuxuan30))
+- Fix a bug may cause infinite loop. [\#3073](https://github.com/danielgindi/Charts/pull/3073) ([JyHu](https://github.com/JyHu))
+- Chartviewbase redundant ivar [\#3045](https://github.com/danielgindi/Charts/pull/3045) ([jjatie](https://github.com/jjatie))
+- Removed `isKind\(of:\)` [\#3044](https://github.com/danielgindi/Charts/pull/3044) ([jjatie](https://github.com/jjatie))
+- Removed redundant ivars in BarLineChartViewBase [\#3043](https://github.com/danielgindi/Charts/pull/3043) ([jjatie](https://github.com/jjatie))
+- fileprivate -\> private [\#3042](https://github.com/danielgindi/Charts/pull/3042) ([jjatie](https://github.com/jjatie))
+- Viewportjob minor cleanup [\#3041](https://github.com/danielgindi/Charts/pull/3041) ([jjatie](https://github.com/jjatie))
+- Removed @objc from internal properties [\#3038](https://github.com/danielgindi/Charts/pull/3038) ([jjatie](https://github.com/jjatie))
+- Minor changes to BubbleChartRenderer logic [\#3010](https://github.com/danielgindi/Charts/pull/3010) ([jjatie](https://github.com/jjatie))
+- BarChartRenderer Logic cleanup [\#3008](https://github.com/danielgindi/Charts/pull/3008) ([jjatie](https://github.com/jjatie))
+- Minor changes to Animator [\#3005](https://github.com/danielgindi/Charts/pull/3005) ([jjatie](https://github.com/jjatie))
+- Minor cleanup to Highlighter types [\#3003](https://github.com/danielgindi/Charts/pull/3003) ([jjatie](https://github.com/jjatie))
+- Resubmit of \#2730 [\#3002](https://github.com/danielgindi/Charts/pull/3002) ([jjatie](https://github.com/jjatie))
+- The backing var is not necessary. [\#3000](https://github.com/danielgindi/Charts/pull/3000) ([jjatie](https://github.com/jjatie))
+- Minor refactoring of Formatter logic [\#2998](https://github.com/danielgindi/Charts/pull/2998) ([jjatie](https://github.com/jjatie))
+- Remove java interface convention [\#2997](https://github.com/danielgindi/Charts/pull/2997) ([jjatie](https://github.com/jjatie))
+- Removed methods and properties deprecated in 1.0 [\#2996](https://github.com/danielgindi/Charts/pull/2996) ([jjatie](https://github.com/jjatie))
+- Replaced `ChartUtils` methods with `CGSize` extensions [\#2995](https://github.com/danielgindi/Charts/pull/2995) ([jjatie](https://github.com/jjatie))
+- Replaced relevant `ChartUtils` methods with `Double` extensions [\#2994](https://github.com/danielgindi/Charts/pull/2994) ([jjatie](https://github.com/jjatie))
+- Replaced `ChartUtils.Math` in favour of an extension on `FloatingPoint` [\#2993](https://github.com/danielgindi/Charts/pull/2993) ([jjatie](https://github.com/jjatie))
+- Minor changes to logic in `ViewPortJob` subclasses. [\#2992](https://github.com/danielgindi/Charts/pull/2992) ([jjatie](https://github.com/jjatie))
+- `ChartRenderer`'s must be initialized with a chart [\#2982](https://github.com/danielgindi/Charts/pull/2982) ([jjatie](https://github.com/jjatie))
+- Animator non nil [\#2981](https://github.com/danielgindi/Charts/pull/2981) ([jjatie](https://github.com/jjatie))
+- View port handler nonnil [\#2980](https://github.com/danielgindi/Charts/pull/2980) ([jjatie](https://github.com/jjatie))
+- Add support for iPhone X [\#2967](https://github.com/danielgindi/Charts/pull/2967) ([liuxuan30](https://github.com/liuxuan30))
+- added highlightColor parameter for pie charts [\#2961](https://github.com/danielgindi/Charts/pull/2961) ([pascalherrmann](https://github.com/pascalherrmann))
+- Add Swift Package Manager support. [\#2950](https://github.com/danielgindi/Charts/pull/2950) ([BrianDoig](https://github.com/BrianDoig))
+- Fix turning off drag in X and Y axes separately. [\#2949](https://github.com/danielgindi/Charts/pull/2949) ([maciejtrybilo](https://github.com/maciejtrybilo))
+- modify for Character Alert: characters is deprecated [\#2942](https://github.com/danielgindi/Charts/pull/2942) ([suzuhiroruri](https://github.com/suzuhiroruri))
+- fix \#2890. Turned out it's multiple bar chart but not grouped [\#2891](https://github.com/danielgindi/Charts/pull/2891) ([liuxuan30](https://github.com/liuxuan30))
+- Update LICENSE [\#2887](https://github.com/danielgindi/Charts/pull/2887) ([sDaniel](https://github.com/sDaniel))
+- fix \#1830. credit from https://github.com/danielgindi/Charts/pull/2049 [\#2874](https://github.com/danielgindi/Charts/pull/2874) ([liuxuan30](https://github.com/liuxuan30))
+- duplicated code for set1 in set2 section [\#2872](https://github.com/danielgindi/Charts/pull/2872) ([liuxuan30](https://github.com/liuxuan30))
+- added DataApproximator+N extension [\#2848](https://github.com/danielgindi/Charts/pull/2848) ([666tos](https://github.com/666tos))
+- Bumped pod version [\#2806](https://github.com/danielgindi/Charts/pull/2806) ([mohpor](https://github.com/mohpor))
+- unwrap optionals [\#2698](https://github.com/danielgindi/Charts/pull/2698) ([russellbstephens](https://github.com/russellbstephens))
+- Replaced unnecessary NSObjectProtocol [\#2629](https://github.com/danielgindi/Charts/pull/2629) ([jjatie](https://github.com/jjatie))
+- Swift iOS Demos [\#2628](https://github.com/danielgindi/Charts/pull/2628) ([jjatie](https://github.com/jjatie))
+- add example playground [\#2364](https://github.com/danielgindi/Charts/pull/2364) ([thierryH91200](https://github.com/thierryH91200))
+- Compatibility with swift playgrounds [\#2335](https://github.com/danielgindi/Charts/pull/2335) ([macteo](https://github.com/macteo))
+
+## [v3.0.4](https://github.com/danielgindi/Charts/tree/v3.0.4) (2017-09-21)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.0.4...v3.0.4)
+
+## [3.0.4](https://github.com/danielgindi/Charts/tree/3.0.4) (2017-09-21)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.0.3...3.0.4)
+
+**Closed issues:**
+
+- cocoaPod can not install branch of swift4 [\#2802](https://github.com/danielgindi/Charts/issues/2802)
+- Swift 4 [\#2801](https://github.com/danielgindi/Charts/issues/2801)
+- how tomake leftAxis.inverted and LineChartDataSet.fillColor not inverted [\#2798](https://github.com/danielgindi/Charts/issues/2798)
+- Bar Chart Demo One Label One Color [\#2792](https://github.com/danielgindi/Charts/issues/2792)
+- BarChart draw vertical dotted lines on specific bars [\#2788](https://github.com/danielgindi/Charts/issues/2788)
+- How can I control the number of decimals? [\#2787](https://github.com/danielgindi/Charts/issues/2787)
+- Charts “3.0.2” cannot find "BalloonMarker"  [\#2786](https://github.com/danielgindi/Charts/issues/2786)
+- Graphs gets cut from both ends [\#2785](https://github.com/danielgindi/Charts/issues/2785)
+- Is it possible to draw multiple lineCharts with different starting points on same view? [\#2783](https://github.com/danielgindi/Charts/issues/2783)
+- getFormattedLabel Index Out of Range [\#2782](https://github.com/danielgindi/Charts/issues/2782)
+- Line chart right axis inset [\#2781](https://github.com/danielgindi/Charts/issues/2781)
+- No type or protocol named 'IChartAxisValueFormatter' [\#2780](https://github.com/danielgindi/Charts/issues/2780)
+- Zero Value is under BarChart [\#2779](https://github.com/danielgindi/Charts/issues/2779)
+- App crashes while using Charts swift library in Objective C Project [\#2778](https://github.com/danielgindi/Charts/issues/2778)
+- Cannot subscript a value of type '\[String : AnyObject\]' with an index of type 'NSAttributedStringKey' [\#2777](https://github.com/danielgindi/Charts/issues/2777)
+- How to drag data entries to change their y value in real time.  [\#2776](https://github.com/danielgindi/Charts/issues/2776)
+- How to break line the legends ?  [\#2775](https://github.com/danielgindi/Charts/issues/2775)
+- How can I get current viewport shown x range and scale value [\#2770](https://github.com/danielgindi/Charts/issues/2770)
+- How to disable scale of left YAxis? [\#2748](https://github.com/danielgindi/Charts/issues/2748)
+- Bar Chart remove x if y is 0 [\#2747](https://github.com/danielgindi/Charts/issues/2747)
+- How to display Negative X-Axis on LineChart [\#797](https://github.com/danielgindi/Charts/issues/797)
+
+**Merged pull requests:**
+
+- Changes for Swift 4 [\#2507](https://github.com/danielgindi/Charts/pull/2507) ([liuxuan30](https://github.com/liuxuan30))
+
+## [v3.0.3](https://github.com/danielgindi/Charts/tree/v3.0.3) (2017-09-08)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.0.3...v3.0.3)
+
+## [3.0.3](https://github.com/danielgindi/Charts/tree/3.0.3) (2017-09-08)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.0.2...3.0.3)
+
+**Implemented enhancements:**
+
+- fatal error: Index out of range [\#2109](https://github.com/danielgindi/Charts/issues/2109)
+
+**Fixed bugs:**
+
+- Crash in YAxisRendererRadarChart [\#2356](https://github.com/danielgindi/Charts/issues/2356)
+- Fatal error when providing multiple data sets in PieChartData [\#2099](https://github.com/danielgindi/Charts/issues/2099)
+
+**Closed issues:**
+
+- X Values Hidden On Bar Graph [\#2774](https://github.com/danielgindi/Charts/issues/2774)
+- How to add new real-time data to lineChart ? [\#2773](https://github.com/danielgindi/Charts/issues/2773)
+- Avoid xAxis limit-labels display in a one-bar BarChart. [\#2771](https://github.com/danielgindi/Charts/issues/2771)
+- zoom at particular position via code [\#2769](https://github.com/danielgindi/Charts/issues/2769)
+- how to use HorizontalBarChart with decimal number as xAxis  [\#2768](https://github.com/danielgindi/Charts/issues/2768)
+- Cannot rescale Y-axis even if changing axisMinimum and axisMaximum [\#2766](https://github.com/danielgindi/Charts/issues/2766)
+- I want to change ValueFormat of BarChartDataSet. I can't change it. [\#2764](https://github.com/danielgindi/Charts/issues/2764)
+- Changing x-label formats from one line to word-wrapped is awkward [\#2763](https://github.com/danielgindi/Charts/issues/2763)
+- chartValueSelected not getting value from Max Value [\#2762](https://github.com/danielgindi/Charts/issues/2762)
+- Dual YAxis  [\#2761](https://github.com/danielgindi/Charts/issues/2761)
+- How to set the position of the values top on BarChartView?  [\#2759](https://github.com/danielgindi/Charts/issues/2759)
+- Line chart xAxis cut left or right in iphone 5 [\#2758](https://github.com/danielgindi/Charts/issues/2758)
+- TableView does not scroll vertically after graph is rendered to cells [\#2757](https://github.com/danielgindi/Charts/issues/2757)
+- Fill the color between two line charts using IFillFormatter [\#2756](https://github.com/danielgindi/Charts/issues/2756)
+- How to use custom view for labels of xAxis? [\#2755](https://github.com/danielgindi/Charts/issues/2755)
+- Chart not consistently showing data [\#2753](https://github.com/danielgindi/Charts/issues/2753)
+- Obtaining current number of points being rendered in zoomed viewing window [\#2752](https://github.com/danielgindi/Charts/issues/2752)
+- Barchart starting above X-Axis [\#2751](https://github.com/danielgindi/Charts/issues/2751)
+- Getting the position of Data array of entry: ChartDataEntry via chartValueSelected\(args\) method [\#2750](https://github.com/danielgindi/Charts/issues/2750)
+- Create Simple Bar Chart [\#2749](https://github.com/danielgindi/Charts/issues/2749)
+- iOS8 simulator crashed iOS 8模拟器崩溃在画Y轴线的地方 [\#2746](https://github.com/danielgindi/Charts/issues/2746)
+- Chart displays values, but no bars [\#2744](https://github.com/danielgindi/Charts/issues/2744)
+- Can not inherit Charts to subclass some cutomize charts [\#2743](https://github.com/danielgindi/Charts/issues/2743)
+- CandleStick fill colors not showing [\#2742](https://github.com/danielgindi/Charts/issues/2742)
+- Bar chart click on outside of bar calling delegate  [\#2741](https://github.com/danielgindi/Charts/issues/2741)
+- Resize chart after adding limit line [\#2739](https://github.com/danielgindi/Charts/issues/2739)
+- Pie chart entry icon get cut [\#2738](https://github.com/danielgindi/Charts/issues/2738)
+- How can I set ValuePosition for individual slices? [\#2736](https://github.com/danielgindi/Charts/issues/2736)
+- You can't slide along the X-axis [\#2735](https://github.com/danielgindi/Charts/issues/2735)
+- Candlechart zooming disable interaction with viewcontroller [\#2734](https://github.com/danielgindi/Charts/issues/2734)
+- 2 datasets, one should only display one label at the top [\#2733](https://github.com/danielgindi/Charts/issues/2733)
+- How do I change the color of the text on top of the bars? [\#2732](https://github.com/danielgindi/Charts/issues/2732)
+- Can't subclass BarChartRenderer due to 'fileprivate' status of many properties [\#2731](https://github.com/danielgindi/Charts/issues/2731)
+- Left axis axisMinimum inside a TableviewCell does not work [\#2729](https://github.com/danielgindi/Charts/issues/2729)
+- How to set minimum displayed Y axis value [\#2728](https://github.com/danielgindi/Charts/issues/2728)
+- Custom Text Axis X Horizontal Bar Chart [\#2726](https://github.com/danielgindi/Charts/issues/2726)
+- Crash when use in Notification Content Extension [\#2725](https://github.com/danielgindi/Charts/issues/2725)
+- Problems encountered with charts [\#2724](https://github.com/danielgindi/Charts/issues/2724)
+- Can I use Charts in Swift 4? [\#2723](https://github.com/danielgindi/Charts/issues/2723)
+- Add gradient to bar chart [\#2722](https://github.com/danielgindi/Charts/issues/2722)
+- Draw bar chart from axisMinimum instead of 0 [\#2721](https://github.com/danielgindi/Charts/issues/2721)
+- Different Charts-Swifg.h when simulator and iphone [\#2720](https://github.com/danielgindi/Charts/issues/2720)
+- Viewport transX jumping when zooming Y scale \(dynamic/realtime data\) [\#2719](https://github.com/danielgindi/Charts/issues/2719)
+- Align X labels with Charts [\#2718](https://github.com/danielgindi/Charts/issues/2718)
+- iOS swift3 Chart xaxis duplicate value issue for linechartview [\#2715](https://github.com/danielgindi/Charts/issues/2715)
+- Label Position xAxis Radar Chart [\#2714](https://github.com/danielgindi/Charts/issues/2714)
+- Showing actual value IN ADDITION to percentage, in a pie slice? [\#2713](https://github.com/danielgindi/Charts/issues/2713)
+- Fail to display any thing in line chart. [\#2712](https://github.com/danielgindi/Charts/issues/2712)
+- How to decrees column width size in LineChart [\#2710](https://github.com/danielgindi/Charts/issues/2710)
+- Runtime EXC\_BAD\_ACCESS with barchart whiles zoom in  [\#2709](https://github.com/danielgindi/Charts/issues/2709)
+- How to format values on barchart [\#2708](https://github.com/danielgindi/Charts/issues/2708)
+- where do I find ioscharts.framework? [\#2707](https://github.com/danielgindi/Charts/issues/2707)
+- Add horizontal line at certain value on Y-Axis? [\#2706](https://github.com/danielgindi/Charts/issues/2706)
+- BarChart does not render with multiple data sets [\#2705](https://github.com/danielgindi/Charts/issues/2705)
+- Balloon Marker: making it work in line chart inside combined view [\#2703](https://github.com/danielgindi/Charts/issues/2703)
+- IValueFormatter text showing More than one Time  [\#2700](https://github.com/danielgindi/Charts/issues/2700)
+- Disable bar selection or highlight? [\#2699](https://github.com/danielgindi/Charts/issues/2699)
+- Increase Yaxis Labes According to the max values. [\#2696](https://github.com/danielgindi/Charts/issues/2696)
+- xAxis scrolling in combineChartView [\#2695](https://github.com/danielgindi/Charts/issues/2695)
+- How to highlight at specific entry ? [\#2693](https://github.com/danielgindi/Charts/issues/2693)
+- Horizontal bar charts 'Y' values are getting overlapped with '0' [\#2691](https://github.com/danielgindi/Charts/issues/2691)
+- Two ChartViews own the same Xaxis [\#2690](https://github.com/danielgindi/Charts/issues/2690)
+- issues about BarChartView [\#2689](https://github.com/danielgindi/Charts/issues/2689)
+- Tap Gesture Handler callback method [\#2686](https://github.com/danielgindi/Charts/issues/2686)
+- How to draw dashed circles for values? [\#2685](https://github.com/danielgindi/Charts/issues/2685)
+- How to Redraw the charts? [\#2684](https://github.com/danielgindi/Charts/issues/2684)
+- BarChartView top border not showing [\#2682](https://github.com/danielgindi/Charts/issues/2682)
+- Drawing horizontal dashed lines except on x-axis line? [\#2681](https://github.com/danielgindi/Charts/issues/2681)
+- X-Axis Date values not displaying properly? [\#2680](https://github.com/danielgindi/Charts/issues/2680)
+- Dashed border on highlighted bar - BarChart [\#2675](https://github.com/danielgindi/Charts/issues/2675)
+- ChartFill - I would like to fill above the line [\#2674](https://github.com/danielgindi/Charts/issues/2674)
+- Anyone have iOS charts working with Xcode 9 Beta? [\#2673](https://github.com/danielgindi/Charts/issues/2673)
+- Change Scale on Y Axis for CombinedChart [\#2672](https://github.com/danielgindi/Charts/issues/2672)
+- Y-axis with text [\#2671](https://github.com/danielgindi/Charts/issues/2671)
+- Show only 2 labels on xAxis in CombinedChartView [\#2670](https://github.com/danielgindi/Charts/issues/2670)
+- Graphing just a part of the data [\#2669](https://github.com/danielgindi/Charts/issues/2669)
+- How to add texts/image into a chart? [\#2667](https://github.com/danielgindi/Charts/issues/2667)
+- Is it possible to scroll without Zooming/ Scaling ? [\#2666](https://github.com/danielgindi/Charts/issues/2666)
+- Use Charts in Swift3,Error [\#2664](https://github.com/danielgindi/Charts/issues/2664)
+- Custom highlighter/marker [\#2663](https://github.com/danielgindi/Charts/issues/2663)
+- Display programatically a marker on a chart [\#2662](https://github.com/danielgindi/Charts/issues/2662)
+- Scrollview inside Marker [\#2661](https://github.com/danielgindi/Charts/issues/2661)
+- Bitcode Problem [\#2660](https://github.com/danielgindi/Charts/issues/2660)
+- Fix Marker on center even when chart is scaled or dragged [\#2659](https://github.com/danielgindi/Charts/issues/2659)
+- How to add marker to center position in ios charts while scrolling horizontally with increasing scaleX and enabling drag [\#2658](https://github.com/danielgindi/Charts/issues/2658)
+- Y Axis scales display format [\#2657](https://github.com/danielgindi/Charts/issues/2657)
+- Marker and long press gesture... [\#2656](https://github.com/danielgindi/Charts/issues/2656)
+- Pie chart Crash [\#2655](https://github.com/danielgindi/Charts/issues/2655)
+- YAxisValues:"Zero" of the integer part is not displayed when the YAxis coordinate is zero [\#2653](https://github.com/danielgindi/Charts/issues/2653)
+- Memory leak when valueFormatter is set [\#2652](https://github.com/danielgindi/Charts/issues/2652)
+- autoScaleMinMaxEnabled, axisMaximum and axisMinimum [\#2651](https://github.com/danielgindi/Charts/issues/2651)
+- Draw X-Axis labels with dates keeping index of x-axis independent like before [\#2648](https://github.com/danielgindi/Charts/issues/2648)
+- About ChartHighLight [\#2647](https://github.com/danielgindi/Charts/issues/2647)
+- Start value from X-Axis [\#2646](https://github.com/danielgindi/Charts/issues/2646)
+- Combined chart with horizontal bar and bubble  [\#2644](https://github.com/danielgindi/Charts/issues/2644)
+- I have a problem with compiling [\#2643](https://github.com/danielgindi/Charts/issues/2643)
+- How to implement custom dataset in objective-c? [\#2639](https://github.com/danielgindi/Charts/issues/2639)
+- I am not able to set values on the bar in simple bar chart. [\#2638](https://github.com/danielgindi/Charts/issues/2638)
+- Swift based Charts library increased application size when used for objective c based project [\#2637](https://github.com/danielgindi/Charts/issues/2637)
+- 使用CombinedChartView绘制柱形图，如何只让当前bar视图显示灰色背影。 [\#2636](https://github.com/danielgindi/Charts/issues/2636)
+- OHLC charts... [\#2635](https://github.com/danielgindi/Charts/issues/2635)
+- unable to set string values on x-axis in grouped bar chart . [\#2632](https://github.com/danielgindi/Charts/issues/2632)
+- How to set group width in multiple bar chart? [\#2631](https://github.com/danielgindi/Charts/issues/2631)
+- override renderLegend\(context: CGContext\) [\#2630](https://github.com/danielgindi/Charts/issues/2630)
+- Changing chart's type without creating a new object... [\#2627](https://github.com/danielgindi/Charts/issues/2627)
+- Using Charts in NSStackView [\#2626](https://github.com/danielgindi/Charts/issues/2626)
+- Does PieChart support multiple columns of vertical legend? [\#2625](https://github.com/danielgindi/Charts/issues/2625)
+- I need this method: setShowOnlyMinMax [\#2624](https://github.com/danielgindi/Charts/issues/2624)
+- Unable to use this library in Objective-c . [\#2623](https://github.com/danielgindi/Charts/issues/2623)
+- 计算柱形图的宽度和设定间隙 [\#2622](https://github.com/danielgindi/Charts/issues/2622)
+- How to adjust RadarChartView text from the bottom of the height？ [\#2621](https://github.com/danielgindi/Charts/issues/2621)
+- How to give all pie-slices a rounded edge? [\#2620](https://github.com/danielgindi/Charts/issues/2620)
+- Alternative color to fill in radar chart  [\#2617](https://github.com/danielgindi/Charts/issues/2617)
+- About gradient color for lineChartView [\#2615](https://github.com/danielgindi/Charts/issues/2615)
+- Invalid bundle  [\#2614](https://github.com/danielgindi/Charts/issues/2614)
+- Want to display circles at data points on a line graph only if the data has changed or is about to change [\#2613](https://github.com/danielgindi/Charts/issues/2613)
+- Swift language Version.  [\#2612](https://github.com/danielgindi/Charts/issues/2612)
+- Linker Command Fail error  [\#2611](https://github.com/danielgindi/Charts/issues/2611)
+- xAxis's first lable always on the left [\#2610](https://github.com/danielgindi/Charts/issues/2610)
+- when i  Creat one LineChartData objc. it's draws Three points  [\#2609](https://github.com/danielgindi/Charts/issues/2609)
+- i wanna display Char form with no data. but with Y Values.  [\#2608](https://github.com/danielgindi/Charts/issues/2608)
+- Is there any way to get the xaxis value when chart scroll end specific area? [\#2607](https://github.com/danielgindi/Charts/issues/2607)
+- Memory Leak in Legend and ArrayBufferProtocol [\#2606](https://github.com/danielgindi/Charts/issues/2606)
+- fatal error due to call to computeAxisValues during call to notifyDataSetChanged [\#2605](https://github.com/danielgindi/Charts/issues/2605)
+- Bar Chart & label displayed wrongly when dataset count changes [\#2603](https://github.com/danielgindi/Charts/issues/2603)
+- BarChart.Axis label change starting index when .rightAxix is enabled [\#2602](https://github.com/danielgindi/Charts/issues/2602)
+- Spacing between left axis labels [\#2601](https://github.com/danielgindi/Charts/issues/2601)
+- React Native support [\#2598](https://github.com/danielgindi/Charts/issues/2598)
+- Not able to see yAxis label while changing position of that label [\#2596](https://github.com/danielgindi/Charts/issues/2596)
+- About stacked bar value label postion  [\#2595](https://github.com/danielgindi/Charts/issues/2595)
+- Invalid Bundle - Xcode 9 Beta 2 [\#2593](https://github.com/danielgindi/Charts/issues/2593)
+- Stacked bar always show last value [\#2592](https://github.com/danielgindi/Charts/issues/2592)
+- Use Charts in App Extension [\#2590](https://github.com/danielgindi/Charts/issues/2590)
+- About bar and line combined [\#2589](https://github.com/danielgindi/Charts/issues/2589)
+- Draw graph of a function  [\#2588](https://github.com/danielgindi/Charts/issues/2588)
+- Scrolling chart [\#2587](https://github.com/danielgindi/Charts/issues/2587)
+- How change value double to value int format? [\#2586](https://github.com/danielgindi/Charts/issues/2586)
+- stringForValue value  [\#2585](https://github.com/danielgindi/Charts/issues/2585)
+- Invalid architecture... support arm64. [\#2584](https://github.com/danielgindi/Charts/issues/2584)
+- Line chart with blank data show Y axis label incorrect on iPhone 5 [\#2583](https://github.com/danielgindi/Charts/issues/2583)
+- 'M\_PI' is deprecated: Please use 'Double.pi' or '.pi' to get the value of correct type and avoid casting.  [\#2580](https://github.com/danielgindi/Charts/issues/2580)
+- 0 lost when the value less than 1.0，why? [\#2579](https://github.com/danielgindi/Charts/issues/2579)
+- Error Library not loaded: @rpath/libswiftAppKit.dylib [\#2578](https://github.com/danielgindi/Charts/issues/2578)
+- CenterText/Description Text overruns onto PieChart [\#2577](https://github.com/danielgindi/Charts/issues/2577)
+- Hide specific legend not all [\#2576](https://github.com/danielgindi/Charts/issues/2576)
+- horizontal barchart each bar have different maximum value [\#2575](https://github.com/danielgindi/Charts/issues/2575)
+- Barchart fixed interval in left axis [\#2574](https://github.com/danielgindi/Charts/issues/2574)
+- Change color of Bar chart data label [\#2573](https://github.com/danielgindi/Charts/issues/2573)
+- Visible ChartDataEntry when zoomed in? [\#2572](https://github.com/danielgindi/Charts/issues/2572)
+- Changing color of the bar graph [\#2571](https://github.com/danielgindi/Charts/issues/2571)
+- Custom bar chart highlight style [\#2570](https://github.com/danielgindi/Charts/issues/2570)
+- How to show LineChart with icon [\#2566](https://github.com/danielgindi/Charts/issues/2566)
+- how to do Paging  [\#2565](https://github.com/danielgindi/Charts/issues/2565)
+- Range float bars [\#2564](https://github.com/danielgindi/Charts/issues/2564)
+- Cropping left axis labels and missing some values [\#2563](https://github.com/danielgindi/Charts/issues/2563)
+- How to create a custom marker view in line chart for showing x values as well [\#2562](https://github.com/danielgindi/Charts/issues/2562)
+- HorizontalBarChartView：when i set Xvalue = 0，1，2，3.....       HorizontalBarChartView some X dont show [\#2559](https://github.com/danielgindi/Charts/issues/2559)
+- But I hope also have the valueFonts property set for each font size, like valueColors [\#2558](https://github.com/danielgindi/Charts/issues/2558)
+- charts uses iphone show "No architectures to compile for \(ONLY\_ACTIVE\_ARCH=YES, active arch=arm64, VALID\_ARCHS=i386 x86\_64 \)". [\#2557](https://github.com/danielgindi/Charts/issues/2557)
+- Caching charts [\#2555](https://github.com/danielgindi/Charts/issues/2555)
+- How to add X axis values in the balloon marker view in IOS Charts? [\#2554](https://github.com/danielgindi/Charts/issues/2554)
+- One label for each data point - Line Chart - SOLUTION FOUND [\#2553](https://github.com/danielgindi/Charts/issues/2553)
+- PieChart legend.yOffset bug [\#2552](https://github.com/danielgindi/Charts/issues/2552)
+- PieChart legend.yOffset bug [\#2551](https://github.com/danielgindi/Charts/issues/2551)
+- Duplicates x-axis labels are plotted separately in graph? [\#2549](https://github.com/danielgindi/Charts/issues/2549)
+- How to set the label count for X axis ? [\#2548](https://github.com/danielgindi/Charts/issues/2548)
+- Hide graph label if value fall below a certain threshold/minimum [\#2547](https://github.com/danielgindi/Charts/issues/2547)
+- BarChar Position Label [\#2546](https://github.com/danielgindi/Charts/issues/2546)
+- Swift language upgrade required  [\#2544](https://github.com/danielgindi/Charts/issues/2544)
+- BarChartDataEntry different value than value  display for each BarChartDataSet [\#2543](https://github.com/danielgindi/Charts/issues/2543)
+- LineChartDataSet why there is no valueFonts [\#2542](https://github.com/danielgindi/Charts/issues/2542)
+- Need swift combined chart demo. [\#2540](https://github.com/danielgindi/Charts/issues/2540)
+- Pie Chart Highlighted region  [\#2536](https://github.com/danielgindi/Charts/issues/2536)
+- Replace the value label without redraw the bar. [\#2535](https://github.com/danielgindi/Charts/issues/2535)
+- Lines on Horizontal Bar Chart [\#2532](https://github.com/danielgindi/Charts/issues/2532)
+- Cannot convert value of type 'AutoreleasingUnsafeMutablePointer\<NSArray\>' to expected argument type 'AutoreleasingUnsafeMutablePointer\<NSArray?\>?' [\#2530](https://github.com/danielgindi/Charts/issues/2530)
+- zoom programatically, reset the zoom, set the highlight and moving the X-Axis and the Y-Axis to the middle [\#2529](https://github.com/danielgindi/Charts/issues/2529)
+- BarGraph - 0 values - Bar Offset [\#2528](https://github.com/danielgindi/Charts/issues/2528)
+- Chart displays intermittently [\#2527](https://github.com/danielgindi/Charts/issues/2527)
+- Changing BarChart xAxis label position [\#2526](https://github.com/danielgindi/Charts/issues/2526)
+- Create PDF Of Charts [\#2525](https://github.com/danielgindi/Charts/issues/2525)
+- What is the equivalent of "onChartDoubleTapped"? [\#2524](https://github.com/danielgindi/Charts/issues/2524)
+- Delegate Memory Leak [\#2523](https://github.com/danielgindi/Charts/issues/2523)
+- Chart is sometimes not showing data on Plus devices [\#2521](https://github.com/danielgindi/Charts/issues/2521)
+- How to run in Xcode 9 \(beta\) [\#2520](https://github.com/danielgindi/Charts/issues/2520)
+- HorizontalBarChartView offset X  [\#2519](https://github.com/danielgindi/Charts/issues/2519)
+- Line not showing in LineChart [\#2518](https://github.com/danielgindi/Charts/issues/2518)
+- Displaying float values in bar chart label. [\#2517](https://github.com/danielgindi/Charts/issues/2517)
+- Not working with Xcode 9 Beta1 [\#2514](https://github.com/danielgindi/Charts/issues/2514)
+- PieChart: Identify univocally a specific entry [\#2513](https://github.com/danielgindi/Charts/issues/2513)
+- Right Align Y Value Labels for Horizontal Bar Chart [\#2512](https://github.com/danielgindi/Charts/issues/2512)
+- Swift 3 Cubic line chart  [\#2510](https://github.com/danielgindi/Charts/issues/2510)
+- Inserting dataPoint "labels" in Radar Chart [\#2508](https://github.com/danielgindi/Charts/issues/2508)
+- How to remove decimals from y values in iOS Charts? [\#2506](https://github.com/danielgindi/Charts/issues/2506)
+- Add background to chart's legend [\#2505](https://github.com/danielgindi/Charts/issues/2505)
+- Combine Bar, Line and Pie chart [\#2503](https://github.com/danielgindi/Charts/issues/2503)
+- Chart not in centre of view [\#2502](https://github.com/danielgindi/Charts/issues/2502)
+- Can't use different Charts Framework with different versions of Xcode [\#2499](https://github.com/danielgindi/Charts/issues/2499)
+- How to change the label colors of certain XAxis values? [\#2498](https://github.com/danielgindi/Charts/issues/2498)
+- Chart points are being clipped out in ScatterChart [\#2496](https://github.com/danielgindi/Charts/issues/2496)
+- PieChart render very small [\#2495](https://github.com/danielgindi/Charts/issues/2495)
+- Bar values inside bar horizontally? [\#2494](https://github.com/danielgindi/Charts/issues/2494)
+- I used Charts in my iOS project and when I start to zoom the chart labels on xAxis get repeated again and again. How can I fix my problem? [\#2493](https://github.com/danielgindi/Charts/issues/2493)
+- linechart shadow [\#2492](https://github.com/danielgindi/Charts/issues/2492)
+- Set a fixed bar width in BarChartView [\#2491](https://github.com/danielgindi/Charts/issues/2491)
+- Linechart inverted [\#2490](https://github.com/danielgindi/Charts/issues/2490)
+- Pie chart not accepting more than one dataSet [\#2489](https://github.com/danielgindi/Charts/issues/2489)
+- Graph x-axis values not displaying in swift 3.0 [\#2488](https://github.com/danielgindi/Charts/issues/2488)
+- How to round corner in Radar Charts? [\#2487](https://github.com/danielgindi/Charts/issues/2487)
+- Display header label on xAxis and yAxis [\#2485](https://github.com/danielgindi/Charts/issues/2485)
+- XAxis label issue with multiple/grouped bar chart [\#2481](https://github.com/danielgindi/Charts/issues/2481)
+- After integration, the project package becomes bigger.  [\#2480](https://github.com/danielgindi/Charts/issues/2480)
+- Pinch to Zoom is not working as expected over Bar Chart [\#2479](https://github.com/danielgindi/Charts/issues/2479)
+- Two markers on one line \[LineChartView\] [\#2476](https://github.com/danielgindi/Charts/issues/2476)
+- Adjust the spacing between bars. \(not grouped\) [\#2475](https://github.com/danielgindi/Charts/issues/2475)
+- Issue with order of x-values and Multi LineChart [\#2474](https://github.com/danielgindi/Charts/issues/2474)
+- Show Integer values on LineChart [\#2473](https://github.com/danielgindi/Charts/issues/2473)
+- Loading a blank chart [\#2472](https://github.com/danielgindi/Charts/issues/2472)
+- LineChart isn't shown correct [\#2471](https://github.com/danielgindi/Charts/issues/2471)
+- Device Orientation not detected when using Charts module [\#2469](https://github.com/danielgindi/Charts/issues/2469)
+- How to set spacing between bars? [\#2467](https://github.com/danielgindi/Charts/issues/2467)
+- what happened to sliceSpace function in piechartdataset? [\#2466](https://github.com/danielgindi/Charts/issues/2466)
+- How to scroll between charts on carousel [\#2465](https://github.com/danielgindi/Charts/issues/2465)
+- PieChartData and NSNumberFormatter memory leak about demo project [\#2464](https://github.com/danielgindi/Charts/issues/2464)
+- Custom View within the PieChart Center [\#2463](https://github.com/danielgindi/Charts/issues/2463)
+- toggle highlight for pie chart slice [\#2462](https://github.com/danielgindi/Charts/issues/2462)
+- HorizontalBarChartView [\#2461](https://github.com/danielgindi/Charts/issues/2461)
+- Cubic Line Distorted  [\#2459](https://github.com/danielgindi/Charts/issues/2459)
+- Plotband support [\#2458](https://github.com/danielgindi/Charts/issues/2458)
+- Bubble charts: Can i set the size same to all the bubbles?  [\#2456](https://github.com/danielgindi/Charts/issues/2456)
+- Single point on line chart not showing - Swift 3 [\#2455](https://github.com/danielgindi/Charts/issues/2455)
+- Plotting large amount of data slows down the Graph. [\#2454](https://github.com/danielgindi/Charts/issues/2454)
+- Error on Manually adding on my project [\#2453](https://github.com/danielgindi/Charts/issues/2453)
+- How to implement Gantt charts using iOS-Charts? [\#2451](https://github.com/danielgindi/Charts/issues/2451)
+- How come I can't set a default color theme in ChartColorTemplate.swift? [\#2450](https://github.com/danielgindi/Charts/issues/2450)
+- What is relation between the BubbleSize and the axis value?Can we control the size of Bubble in Bubble Chart? [\#2448](https://github.com/danielgindi/Charts/issues/2448)
+- chart 3.0 xAxis labels not mapped [\#2447](https://github.com/danielgindi/Charts/issues/2447)
+- fatal error: Index out of range while subclassing renderer [\#2446](https://github.com/danielgindi/Charts/issues/2446)
+- Bug in line chart yAxis when range are less than 1 [\#2445](https://github.com/danielgindi/Charts/issues/2445)
+- Help with custom graphic/chart [\#2442](https://github.com/danielgindi/Charts/issues/2442)
+- PieChart center Attributed Text [\#2441](https://github.com/danielgindi/Charts/issues/2441)
+- PieChart center Attributed Text [\#2440](https://github.com/danielgindi/Charts/issues/2440)
+- show tooltip on click [\#2438](https://github.com/danielgindi/Charts/issues/2438)
+- Got Error : “\_OBJC\_CLASS\_$\_\_TtC10ChartsDemo12XYMarkerView” in Charts [\#2437](https://github.com/danielgindi/Charts/issues/2437)
+- Change color label over circle [\#2436](https://github.com/danielgindi/Charts/issues/2436)
+- How to set labels based on max and min value of the plot? [\#2434](https://github.com/danielgindi/Charts/issues/2434)
+- How to make the pie chart selected by default？ [\#2431](https://github.com/danielgindi/Charts/issues/2431)
+- Animate 3 dataSets one by one [\#2428](https://github.com/danielgindi/Charts/issues/2428)
+- Marker points on wrong position [\#2426](https://github.com/danielgindi/Charts/issues/2426)
+- Legend leak in version 3.0.1 [\#2425](https://github.com/danielgindi/Charts/issues/2425)
+- Show Two Circles in Pie Chart [\#2424](https://github.com/danielgindi/Charts/issues/2424)
+- restrainViewPort is not working. Chart stays the same! [\#2423](https://github.com/danielgindi/Charts/issues/2423)
+- Line Chart show value on specific coordinate [\#2420](https://github.com/danielgindi/Charts/issues/2420)
+- Is it possible to extend the gesture handler? [\#2419](https://github.com/danielgindi/Charts/issues/2419)
+- Memory Leak in BarChartView Data  [\#2416](https://github.com/danielgindi/Charts/issues/2416)
+- Track Scroll Left or Right [\#2415](https://github.com/danielgindi/Charts/issues/2415)
+- How can I add the xVals to LineChartData object? [\#2412](https://github.com/danielgindi/Charts/issues/2412)
+- Line chart doesn't redraw correctly after removeEntry\(\) [\#2411](https://github.com/danielgindi/Charts/issues/2411)
+- Bar width [\#2410](https://github.com/danielgindi/Charts/issues/2410)
+- There is no way to restrict zoom level after certain zoom level [\#2409](https://github.com/danielgindi/Charts/issues/2409)
+- Half Pie Chart no full view [\#2408](https://github.com/danielgindi/Charts/issues/2408)
+- How to use gradient colors for each column in a histogram? [\#2407](https://github.com/danielgindi/Charts/issues/2407)
+- Fill line chart when drag with two fingers [\#2405](https://github.com/danielgindi/Charts/issues/2405)
+- chartValueSelected Delegate Method Not Called [\#2404](https://github.com/danielgindi/Charts/issues/2404)
+- Draw bar line even though the value is zero [\#2403](https://github.com/danielgindi/Charts/issues/2403)
+- Adding line/dataset on line chart that already has a line [\#2401](https://github.com/danielgindi/Charts/issues/2401)
+- help with labels [\#2400](https://github.com/danielgindi/Charts/issues/2400)
+-  'Charts/Charts.h' file not found when tried build using "XCODEBUILD" command in terminal [\#2397](https://github.com/danielgindi/Charts/issues/2397)
+- moveViewToX\(\) has no affect on a chart whose frame has not been set yet [\#2395](https://github.com/danielgindi/Charts/issues/2395)
+- Appending Units\(i.e. m/s, mpg, etc\) to yaxis?? [\#2394](https://github.com/danielgindi/Charts/issues/2394)
+- Chart Top label Issue [\#2392](https://github.com/danielgindi/Charts/issues/2392)
+- How to just draw one circle value for LineChartView [\#2391](https://github.com/danielgindi/Charts/issues/2391)
+- Support for 3D charts [\#2389](https://github.com/danielgindi/Charts/issues/2389)
+- Y Axis range calculation is incorrect for Bar Charts [\#2386](https://github.com/danielgindi/Charts/issues/2386)
+- Is having a ChartViewBase inside a custom UIView even possible? [\#2384](https://github.com/danielgindi/Charts/issues/2384)
+- "chartValueSelected" is not getting called.  [\#2383](https://github.com/danielgindi/Charts/issues/2383)
+- Does it support XO line\(American CandleStick\)? [\#2382](https://github.com/danielgindi/Charts/issues/2382)
+- Chart Won't Display [\#2381](https://github.com/danielgindi/Charts/issues/2381)
+- autoScaleMinMaxEnabled Not Working [\#2374](https://github.com/danielgindi/Charts/issues/2374)
+- Graph is being drawn outside of visible area [\#2373](https://github.com/danielgindi/Charts/issues/2373)
+- Compile error on Release build configuration [\#2372](https://github.com/danielgindi/Charts/issues/2372)
+- moveViewToX clips bar [\#2370](https://github.com/danielgindi/Charts/issues/2370)
+- swift 3.x -\> New ChartMarker? [\#2369](https://github.com/danielgindi/Charts/issues/2369)
+- Crash on computeAxisValues of Bar Chart [\#2368](https://github.com/danielgindi/Charts/issues/2368)
+- How to properly reset zoom on data refresh? [\#2367](https://github.com/danielgindi/Charts/issues/2367)
+- What is the meaning of xValue in moveViewToAnimated? [\#2366](https://github.com/danielgindi/Charts/issues/2366)
+- Horizontal Bar Chart rightAxis default maximum space [\#2363](https://github.com/danielgindi/Charts/issues/2363)
+- Why my LineChartDataSet's line is behind the bar? [\#2354](https://github.com/danielgindi/Charts/issues/2354)
+- charts2.5 bottom line render issue [\#2352](https://github.com/danielgindi/Charts/issues/2352)
+- Limit the number of bars to 10 when the x-axis is made of strings [\#2351](https://github.com/danielgindi/Charts/issues/2351)
+- Not able to plot values in linechart  [\#2349](https://github.com/danielgindi/Charts/issues/2349)
+- Text in Marker [\#2348](https://github.com/danielgindi/Charts/issues/2348)
+- PieChart overlay lines or dots for select slices in the pie chart [\#2347](https://github.com/danielgindi/Charts/issues/2347)
+- Multiple colors grid background [\#2346](https://github.com/danielgindi/Charts/issues/2346)
+- The direction of the two BarChart [\#2345](https://github.com/danielgindi/Charts/issues/2345)
+- how to format y-axix values [\#2343](https://github.com/danielgindi/Charts/issues/2343)
+- different Bar color based on values [\#2342](https://github.com/danielgindi/Charts/issues/2342)
+- XCode wants to convert Chart  [\#2341](https://github.com/danielgindi/Charts/issues/2341)
+- Population Pyramid [\#2340](https://github.com/danielgindi/Charts/issues/2340)
+- Not all labels shown on horizontal bar chart with large datasets [\#2339](https://github.com/danielgindi/Charts/issues/2339)
+- Using ChartViewBase as the type and instantiating the chart later as a specific type [\#2338](https://github.com/danielgindi/Charts/issues/2338)
+- Remove Highlight from bar graph [\#2337](https://github.com/danielgindi/Charts/issues/2337)
+- Set diffent style to single line graph  [\#2336](https://github.com/danielgindi/Charts/issues/2336)
+- change the color of the highlight point [\#2334](https://github.com/danielgindi/Charts/issues/2334)
+- Extra space to the right of chart [\#2333](https://github.com/danielgindi/Charts/issues/2333)
+- xcode 8.3 swift 3.1 [\#2332](https://github.com/danielgindi/Charts/issues/2332)
+- AxisDependencyRight  Question~~ [\#2331](https://github.com/danielgindi/Charts/issues/2331)
+- Module Charts not found XCODE 8.1 Error [\#2330](https://github.com/danielgindi/Charts/issues/2330)
+- How to remove Grid  [\#2329](https://github.com/danielgindi/Charts/issues/2329)
+- The spacing between the two points is wider than the distance between the labels [\#2327](https://github.com/danielgindi/Charts/issues/2327)
+- Skipped installing realm-cocoa.framework binary due to the error: [\#2326](https://github.com/danielgindi/Charts/issues/2326)
+- Pie Chart view as Int instead of double on segment? [\#2325](https://github.com/danielgindi/Charts/issues/2325)
+- Not able to give X axis Values [\#2324](https://github.com/danielgindi/Charts/issues/2324)
+- Labels to PieChart? v 3.0.2 [\#2323](https://github.com/danielgindi/Charts/issues/2323)
+- How to prevent static data sets from redrawing and hogging CPU [\#2322](https://github.com/danielgindi/Charts/issues/2322)
+- BarChart xAxis labels a moving [\#2321](https://github.com/danielgindi/Charts/issues/2321)
+- How to add a fade background for data values [\#2320](https://github.com/danielgindi/Charts/issues/2320)
+- Limit Line after update to 3.0.2 no longer shown [\#2319](https://github.com/danielgindi/Charts/issues/2319)
+- Charts v3.0.2 does not build using Carthage [\#2317](https://github.com/danielgindi/Charts/issues/2317)
+- spaceMin and spaceMax are not percentages [\#2314](https://github.com/danielgindi/Charts/issues/2314)
+- API for increasing or decreasing condition for CandleStick Chart [\#2311](https://github.com/danielgindi/Charts/issues/2311)
+- Create Tag to include 'fix for Xcode 8.3' [\#2309](https://github.com/danielgindi/Charts/issues/2309)
+- Ambiguous use of 'data' [\#2304](https://github.com/danielgindi/Charts/issues/2304)
+- Default backgroundColor \(nil\) displays as black instead of clear. [\#2222](https://github.com/danielgindi/Charts/issues/2222)
+- pdf report with Line Chart blurry from iphone 7 [\#2204](https://github.com/danielgindi/Charts/issues/2204)
+- how to add Values to Pie Chart? and how to show complete pie chart instead of doughnut [\#2150](https://github.com/danielgindi/Charts/issues/2150)
+- 'LineChartView' is unavailable: cannot find Swift declaration for this class [\#2145](https://github.com/danielgindi/Charts/issues/2145)
+- Display label MMyyyy for barChart [\#2142](https://github.com/danielgindi/Charts/issues/2142)
+- barSpace  attribute [\#2137](https://github.com/danielgindi/Charts/issues/2137)
+- Bar Chart, Shifting Y Position [\#2134](https://github.com/danielgindi/Charts/issues/2134)
+- highlightValue is throwing "fatal error: Index out of range" in Combined Chart [\#2076](https://github.com/danielgindi/Charts/issues/2076)
+
+**Merged pull requests:**
+
+- Update xcode project for xcode 9 [\#2767](https://github.com/danielgindi/Charts/pull/2767) ([petester42](https://github.com/petester42))
+- Fixed value setter on PieChartDataEntry [\#2754](https://github.com/danielgindi/Charts/pull/2754) ([martnst](https://github.com/martnst))
+- Conform to macOS api changes in swift 3.2 [\#2717](https://github.com/danielgindi/Charts/pull/2717) ([ohbargain](https://github.com/ohbargain))
+- Fix CombinedChartView not draw markers [\#2702](https://github.com/danielgindi/Charts/pull/2702) ([xzysun](https://github.com/xzysun))
+- Reduce build time with minor reference refactor [\#2679](https://github.com/danielgindi/Charts/pull/2679) ([xinranw](https://github.com/xinranw))
+- Fix Typo: Probider -\> Provider [\#2650](https://github.com/danielgindi/Charts/pull/2650) ([russellbstephens](https://github.com/russellbstephens))
+- Adding a third party tutorial [\#2604](https://github.com/danielgindi/Charts/pull/2604) ([osianSmith](https://github.com/osianSmith))
+- fix \#2099, avoid crash when some chart only allow 1 data set [\#2500](https://github.com/danielgindi/Charts/pull/2500) ([liuxuan30](https://github.com/liuxuan30))
+- tutorial link added to readme [\#2484](https://github.com/danielgindi/Charts/pull/2484) ([annalizhaz](https://github.com/annalizhaz))
+- Allow turning off drag in X and Y axes separately. [\#2413](https://github.com/danielgindi/Charts/pull/2413) ([maciejtrybilo](https://github.com/maciejtrybilo))
+- Run view port jobs afterwards \(Fixes \#2395\) [\#2396](https://github.com/danielgindi/Charts/pull/2396) ([feosuna1](https://github.com/feosuna1))
+- Minor improvements in BalloonMarker.swift [\#2393](https://github.com/danielgindi/Charts/pull/2393) ([valeriyvan](https://github.com/valeriyvan))
+- remove build for ci tests procedure, use `clean test` directly [\#2388](https://github.com/danielgindi/Charts/pull/2388) ([liuxuan30](https://github.com/liuxuan30))
+- Update Travis config for Xcode 8.3 and fix test failures [\#2378](https://github.com/danielgindi/Charts/pull/2378) ([liuxuan30](https://github.com/liuxuan30))
+- Fix Simple Bar Chart Demo, switch use of x and y values [\#2365](https://github.com/danielgindi/Charts/pull/2365) ([franqueli](https://github.com/franqueli))
+- Bug fixing with one line, updating ChartViewBase.swift [\#2355](https://github.com/danielgindi/Charts/pull/2355) ([Eric0625](https://github.com/Eric0625))
+- Fixed, If the last value is the max or min, the range will be wrong [\#2229](https://github.com/danielgindi/Charts/pull/2229) ([aelam](https://github.com/aelam))
+- fix \#2222 move default backgroundColor to initialize\(\) [\#2228](https://github.com/danielgindi/Charts/pull/2228) ([liuxuan30](https://github.com/liuxuan30))
+- Fix \#1879. Similar cut in half issue in scatter chart like others [\#1891](https://github.com/danielgindi/Charts/pull/1891) ([liuxuan30](https://github.com/liuxuan30))
+
+## [v3.0.2](https://github.com/danielgindi/Charts/tree/v3.0.2) (2017-04-02)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.0.2...v3.0.2)
+
+## [3.0.2](https://github.com/danielgindi/Charts/tree/3.0.2) (2017-04-02)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.0.1...3.0.2)
+
+**Implemented enhancements:**
+
+- Plotting Realm data in Swift. RLMResults not available [\#898](https://github.com/danielgindi/Charts/issues/898)
+
+**Fixed bugs:**
+
+- \[Bug\] Double BarChart second value text mispaced [\#1191](https://github.com/danielgindi/Charts/issues/1191)
+- \<Error\>: CGAffineTransformInvert: singular matrix [\#802](https://github.com/danielgindi/Charts/issues/802)
+
+**Closed issues:**
+
+- Please give option for installing via Swift Package Manager too [\#2313](https://github.com/danielgindi/Charts/issues/2313)
+- Adjust spacing between axis labels and axes? [\#2310](https://github.com/danielgindi/Charts/issues/2310)
+- \*PieChart\* Get color of top 3 largest percent [\#2308](https://github.com/danielgindi/Charts/issues/2308)
+- Set the x axis data problems, and 2.3.0 apis are quite different.Need your help [\#2307](https://github.com/danielgindi/Charts/issues/2307)
+- little issue with chart custoemView size & chart data  [\#2305](https://github.com/danielgindi/Charts/issues/2305)
+- hello，A small problem. [\#2303](https://github.com/danielgindi/Charts/issues/2303)
+- Running 1 of 1 custom shell scripts [\#2302](https://github.com/danielgindi/Charts/issues/2302)
+- Multiple warnings xCode 8.3 [\#2298](https://github.com/danielgindi/Charts/issues/2298)
+- Remove color label in pie-chart [\#2297](https://github.com/danielgindi/Charts/issues/2297)
+- Charts 2.3 with Swift 3 \(xCode 8.3\) [\#2295](https://github.com/danielgindi/Charts/issues/2295)
+- Modify Marker before showing value [\#2294](https://github.com/danielgindi/Charts/issues/2294)
+- Xcode 8.3: 62 deprecation warnings [\#2293](https://github.com/danielgindi/Charts/issues/2293)
+- Fix warning for Xcode8.3 [\#2292](https://github.com/danielgindi/Charts/issues/2292)
+- Chart Selected function is not called on click of every Bar. [\#2291](https://github.com/danielgindi/Charts/issues/2291)
+- “Swift Language Version” [\#2290](https://github.com/danielgindi/Charts/issues/2290)
+- Swift 3.1 support [\#2288](https://github.com/danielgindi/Charts/issues/2288)
+- Swift 3.1 Build [\#2287](https://github.com/danielgindi/Charts/issues/2287)
+- ChartTouchDelegate never called [\#2286](https://github.com/danielgindi/Charts/issues/2286)
+- Radar map size setting [\#2284](https://github.com/danielgindi/Charts/issues/2284)
+- How do I set the radar map size? [\#2283](https://github.com/danielgindi/Charts/issues/2283)
+- Adjust circle radius for individual line chart data point [\#2282](https://github.com/danielgindi/Charts/issues/2282)
+- Get current axis interval between labels [\#2281](https://github.com/danielgindi/Charts/issues/2281)
+- Only allow slice space for the selected item in a pie chart [\#2278](https://github.com/danielgindi/Charts/issues/2278)
+- PieChartDataSet [\#2277](https://github.com/danielgindi/Charts/issues/2277)
+- I want to un-highlight a line chart when dragging has stopped, among other things. Am I missing it?  Thanks [\#2276](https://github.com/danielgindi/Charts/issues/2276)
+- Demo for Swift 3 [\#2274](https://github.com/danielgindi/Charts/issues/2274)
+- Getting the percentage and label for a slice [\#2273](https://github.com/danielgindi/Charts/issues/2273)
+- Line chart - LineChartDataSet Background color. [\#2272](https://github.com/danielgindi/Charts/issues/2272)
+- place image at top of each bar in bar graph [\#2271](https://github.com/danielgindi/Charts/issues/2271)
+- How to draw circle at the end of a data set on line chart  [\#2270](https://github.com/danielgindi/Charts/issues/2270)
+- when i install pod 'Charts'. its install Old Version Of library 2.3 and give me error convert code into latest swift. [\#2269](https://github.com/danielgindi/Charts/issues/2269)
+- ChartsDemo Buildtime Error: No such module 'RealmSwift' [\#2268](https://github.com/danielgindi/Charts/issues/2268)
+- Total Data [\#2267](https://github.com/danielgindi/Charts/issues/2267)
+- Line Chart Highlight, Remove X axis line and display label [\#2266](https://github.com/danielgindi/Charts/issues/2266)
+- Increasing bar width in grouped sets of BarChartView [\#2263](https://github.com/danielgindi/Charts/issues/2263)
+- lineChart.leftAxis.startAtZeroEnabled is not available in Swift 3 library [\#2262](https://github.com/danielgindi/Charts/issues/2262)
+- Can't find highlightcolor [\#2256](https://github.com/danielgindi/Charts/issues/2256)
+- Custom yAxis values [\#2254](https://github.com/danielgindi/Charts/issues/2254)
+- Dynamic generate Int values for axis [\#2253](https://github.com/danielgindi/Charts/issues/2253)
+- viewController can't be dealloc [\#2252](https://github.com/danielgindi/Charts/issues/2252)
+- How to include a gap between data points & lines [\#2251](https://github.com/danielgindi/Charts/issues/2251)
+- Highlight particular X and Y coordinations in the iOS charts [\#2250](https://github.com/danielgindi/Charts/issues/2250)
+- Bar shapes are overlapped with other bars  [\#2248](https://github.com/danielgindi/Charts/issues/2248)
+- Xaxis Label value in range \(2.5-5.0,5.0-7.5\) [\#2246](https://github.com/danielgindi/Charts/issues/2246)
+- Multiline axis labels are cut off [\#2244](https://github.com/danielgindi/Charts/issues/2244)
+- Problems with creating CombinedChart \(Line + grouped BarChart\) in Swift 3.0 [\#2243](https://github.com/danielgindi/Charts/issues/2243)
+- Convert to Current Swift Syntax [\#2242](https://github.com/danielgindi/Charts/issues/2242)
+- Line chart real time data - memory leak [\#2241](https://github.com/danielgindi/Charts/issues/2241)
+- Radar chart bug - grey view shown on 6 plus and 7 plus [\#2238](https://github.com/danielgindi/Charts/issues/2238)
+- How to set dual axis in line chart  [\#2237](https://github.com/danielgindi/Charts/issues/2237)
+- Tableview stuttering when rendering a pie chart [\#2234](https://github.com/danielgindi/Charts/issues/2234)
+- Set vertical legend [\#2233](https://github.com/danielgindi/Charts/issues/2233)
+- how to join XAxisLabel in MultipleBarChart under every Bar [\#2232](https://github.com/danielgindi/Charts/issues/2232)
+- Custom xAxisRenderer [\#2230](https://github.com/danielgindi/Charts/issues/2230)
+- demo can not run [\#2227](https://github.com/danielgindi/Charts/issues/2227)
+- Change color of lineChartDataSet when chartValueSelected [\#2226](https://github.com/danielgindi/Charts/issues/2226)
+- Legend Label problem when the device changes orientation [\#2224](https://github.com/danielgindi/Charts/issues/2224)
+- Legend vertical offset for horizontally aligned legends [\#2223](https://github.com/danielgindi/Charts/issues/2223)
+- Don't display or load all Variables on the Left of the Bar \(iOS - Swift 3\) [\#2221](https://github.com/danielgindi/Charts/issues/2221)
+- Horizontal Bar Chart lines not visible with two BarChartDataSet in chart data [\#2220](https://github.com/danielgindi/Charts/issues/2220)
+- Bar chart with limit line for each Bar [\#2219](https://github.com/danielgindi/Charts/issues/2219)
+- why the zero can't show at the first [\#2218](https://github.com/danielgindi/Charts/issues/2218)
+- About BalloonMarker [\#2216](https://github.com/danielgindi/Charts/issues/2216)
+- How can I have these values in positive? Thanks. [\#2212](https://github.com/danielgindi/Charts/issues/2212)
+- Line Graph is not showing line on the Chart [\#2209](https://github.com/danielgindi/Charts/issues/2209)
+- Issue of enum description [\#2208](https://github.com/danielgindi/Charts/issues/2208)
+- I find a issues in HorizontalBarChartView  [\#2205](https://github.com/danielgindi/Charts/issues/2205)
+- My ipa\(used Charts\) is 40M ;another ipa\(unused Charts\) is 13M,how to be sliming??? [\#2203](https://github.com/danielgindi/Charts/issues/2203)
+- Legend vertical offset [\#2202](https://github.com/danielgindi/Charts/issues/2202)
+- Charts not showing on tvOS [\#2201](https://github.com/danielgindi/Charts/issues/2201)
+- Is it enable to keep the origin visible X Range when I appended more data  [\#2198](https://github.com/danielgindi/Charts/issues/2198)
+- Issue with Realm [\#2195](https://github.com/danielgindi/Charts/issues/2195)
+- External lines - Pie Chart [\#2194](https://github.com/danielgindi/Charts/issues/2194)
+- Hide labels - Pie chart [\#2193](https://github.com/danielgindi/Charts/issues/2193)
+- is two sided bar graph possible ? [\#2192](https://github.com/danielgindi/Charts/issues/2192)
+- Optimisation of drawing many points on line graph [\#2190](https://github.com/danielgindi/Charts/issues/2190)
+- Bar Chart with dual axis [\#2188](https://github.com/danielgindi/Charts/issues/2188)
+- Customize Text inside Ballon Marker [\#2186](https://github.com/danielgindi/Charts/issues/2186)
+- "Shell Script Invocation Error: Command /bin/sh failed with exit code 1'  [\#2185](https://github.com/danielgindi/Charts/issues/2185)
+- Increase space between bars with only one dataset and assign font for specific value and xAxis label [\#2184](https://github.com/danielgindi/Charts/issues/2184)
+- "noDataText" does not work [\#2179](https://github.com/danielgindi/Charts/issues/2179)
+- Change color of one label [\#2178](https://github.com/danielgindi/Charts/issues/2178)
+- Line Chart not show empty values - Charts 3.0 [\#2176](https://github.com/danielgindi/Charts/issues/2176)
+- Bottom Label is not printing whole array list. [\#2175](https://github.com/danielgindi/Charts/issues/2175)
+- Stacked Horizontal Chart Scaling [\#2174](https://github.com/danielgindi/Charts/issues/2174)
+- How to set different colors for intervals on LineChart? [\#2172](https://github.com/danielgindi/Charts/issues/2172)
+- Could you tell me how to forbidden line chart scroll up and down? [\#2171](https://github.com/danielgindi/Charts/issues/2171)
+- Fixed BarWidth based on Pixel for BarChart [\#2170](https://github.com/danielgindi/Charts/issues/2170)
+- Branch Chart3.0-Swift2.3 not found. [\#2166](https://github.com/danielgindi/Charts/issues/2166)
+- "clipValuesToContentEnabled" does not work [\#2163](https://github.com/danielgindi/Charts/issues/2163)
+- BarChartView with TableView [\#2161](https://github.com/danielgindi/Charts/issues/2161)
+- How to show label on x-axis at regular interval and tail end on the graph line [\#2160](https://github.com/danielgindi/Charts/issues/2160)
+- Set line cap to CGMutablePath [\#2159](https://github.com/danielgindi/Charts/issues/2159)
+- why we set the y value 2.57,but the chart show 3,if i set y value2.44,the chart show 2.how to do the problem. [\#2157](https://github.com/danielgindi/Charts/issues/2157)
+- Demo crush !!! [\#2154](https://github.com/danielgindi/Charts/issues/2154)
+- Fixing the Segmentation fault issue after Convert to Swift 3.0 [\#2151](https://github.com/danielgindi/Charts/issues/2151)
+- GitHub API request failed [\#2149](https://github.com/danielgindi/Charts/issues/2149)
+- y-Values and x-Values as string in barchart, [\#2147](https://github.com/danielgindi/Charts/issues/2147)
+- Piechart with smooth edges? [\#2146](https://github.com/danielgindi/Charts/issues/2146)
+- Pie chart highlighted slice offset [\#2144](https://github.com/danielgindi/Charts/issues/2144)
+- Formatter data on OS X [\#2141](https://github.com/danielgindi/Charts/issues/2141)
+- How to add dates to line chart? [\#2136](https://github.com/danielgindi/Charts/issues/2136)
+- 'backgroundColor' is inaccessible due to 'internal' protection level on mac OS X [\#2135](https://github.com/danielgindi/Charts/issues/2135)
+- Some object files have incompatible Objective-C category definitions. Some category metadata may be lost. All files containing Objective-C categories should be built using the same compiler. [\#2133](https://github.com/danielgindi/Charts/issues/2133)
+- Any Demo of all charts in Swift 3 [\#2132](https://github.com/danielgindi/Charts/issues/2132)
+- How to access the Position of labels on x axis of Combined Line and Bar chart on swift\(3.0.1\) [\#2131](https://github.com/danielgindi/Charts/issues/2131)
+- Wrong Limit line positioning when axisMinimum is set to 0 [\#2128](https://github.com/danielgindi/Charts/issues/2128)
+- Extremely Slow compile Times on XCode 8.2.1 and swift 3.0.2 [\#2127](https://github.com/danielgindi/Charts/issues/2127)
+- How to add TrackBall and edit label above BarCharts in Charts swift2 and swift 3?? [\#2126](https://github.com/danielgindi/Charts/issues/2126)
+- Xcode 8.3 Compatible [\#2125](https://github.com/danielgindi/Charts/issues/2125)
+- LineChartData\(dataSets: dataSets\)  Missing xVals [\#2124](https://github.com/danielgindi/Charts/issues/2124)
+- How to assign custom String values to XAxis? [\#2122](https://github.com/danielgindi/Charts/issues/2122)
+- Simple Radar Chart causing hang / cpu 99% [\#2121](https://github.com/danielgindi/Charts/issues/2121)
+- Can i use the framework without including the whole project ? [\#2118](https://github.com/danielgindi/Charts/issues/2118)
+- Undefined symbols for architecture arm64 - Charts 3.0 CocoaPods [\#2117](https://github.com/danielgindi/Charts/issues/2117)
+- method setlabelstoskip missing from XAxis.swift [\#2115](https://github.com/danielgindi/Charts/issues/2115)
+- SocketIOClientConfiguration.swift wont compile [\#2113](https://github.com/danielgindi/Charts/issues/2113)
+- No code signing identities found: No valid signing identities \(i.e. certificate and private key pair\) were found [\#2112](https://github.com/danielgindi/Charts/issues/2112)
+- Can I custom draw circle in LineChart in version 3.0 ?\[help\] [\#2104](https://github.com/danielgindi/Charts/issues/2104)
+- App crash XCode 8.2 Chart version 3.0 [\#2103](https://github.com/danielgindi/Charts/issues/2103)
+- Charts 3.0.1 - Align x labels \(dates\) with plots [\#2094](https://github.com/danielgindi/Charts/issues/2094)
+- Demo in Swift 3 [\#2092](https://github.com/danielgindi/Charts/issues/2092)
+- How to set xAxis values from array in Swift 3.0 [\#2090](https://github.com/danielgindi/Charts/issues/2090)
+- error to Methode  [\#2089](https://github.com/danielgindi/Charts/issues/2089)
+- fitBars doesnt seems to work [\#2088](https://github.com/danielgindi/Charts/issues/2088)
+- oh, no!!!!!!  Demo code can't run   [\#2087](https://github.com/danielgindi/Charts/issues/2087)
+- In BarChartView leftAxis labels cutdown, does-not fit on screen.  [\#2086](https://github.com/danielgindi/Charts/issues/2086)
+- accessing .rightAxis gives EXC\_BAD\_ACCESS [\#2082](https://github.com/danielgindi/Charts/issues/2082)
+- leftAxis and value overlap in lineChartView [\#2080](https://github.com/danielgindi/Charts/issues/2080)
+- I want to add 4 colours to the background of the chart. The colour zones depend on the y values. [\#2079](https://github.com/danielgindi/Charts/issues/2079)
+- Value labels for multiple ChartDataSets all aligned at the beginning \(left\) of each bar in HorizontalBarChart [\#2077](https://github.com/danielgindi/Charts/issues/2077)
+- How to Resize Labels in Pie Chart Legend [\#2075](https://github.com/danielgindi/Charts/issues/2075)
+- Bar chart data entry [\#2074](https://github.com/danielgindi/Charts/issues/2074)
+- How can I have a limit zone \(in android library mpandroidchart\) like feature in this iOS library [\#2073](https://github.com/danielgindi/Charts/issues/2073)
+- BarChartView is unavailable, cannot find swift declaration [\#2072](https://github.com/danielgindi/Charts/issues/2072)
+- Not enable to draw custom shape which is based on the XValue or YValue ?  [\#2071](https://github.com/danielgindi/Charts/issues/2071)
+- Can horizontalBarChartView invert the Axis ? [\#2070](https://github.com/danielgindi/Charts/issues/2070)
+- can't set different padding of each side  [\#2068](https://github.com/danielgindi/Charts/issues/2068)
+- Area chart with missing points [\#2067](https://github.com/danielgindi/Charts/issues/2067)
+- Demo code can't run [\#2066](https://github.com/danielgindi/Charts/issues/2066)
+- Positioning the XAxis inconsistent with Y-axis and the Wiki in Swift 3 [\#2065](https://github.com/danielgindi/Charts/issues/2065)
+- Radar chart title [\#2061](https://github.com/danielgindi/Charts/issues/2061)
+- fixed increment [\#2059](https://github.com/danielgindi/Charts/issues/2059)
+- Line Chart with callouts [\#2058](https://github.com/danielgindi/Charts/issues/2058)
+- Delegate ChartValueSelected Not Called. [\#2057](https://github.com/danielgindi/Charts/issues/2057)
+- IValueFormatter protocol not working [\#2055](https://github.com/danielgindi/Charts/issues/2055)
+- "BalloonMarker“ cannot be find in my project [\#2051](https://github.com/danielgindi/Charts/issues/2051)
+- How to use marker when I use CombinedChart?  [\#2046](https://github.com/danielgindi/Charts/issues/2046)
+- yVals have decimal point [\#2045](https://github.com/danielgindi/Charts/issues/2045)
+- LeftAxis Labels will disappear [\#2044](https://github.com/danielgindi/Charts/issues/2044)
+- Can't addEntry to a set in Swift 3 [\#2043](https://github.com/danielgindi/Charts/issues/2043)
+- Will not compile in existing Objective-C Project. [\#2041](https://github.com/danielgindi/Charts/issues/2041)
+- labels on xAxis not showing up and incorrect values on yAxis [\#2040](https://github.com/danielgindi/Charts/issues/2040)
+- xAxis.valueFormatter = self  create retain cycle [\#2039](https://github.com/danielgindi/Charts/issues/2039)
+- Label's point of view [\#2038](https://github.com/danielgindi/Charts/issues/2038)
+- How to show limited visible xValues labels? [\#2037](https://github.com/danielgindi/Charts/issues/2037)
+- BarChart XAxis between Positive & Negative Values [\#2036](https://github.com/danielgindi/Charts/issues/2036)
+- Error when trying to run ChartsDemo on iOS Simulator \(image not found\) [\#2035](https://github.com/danielgindi/Charts/issues/2035)
+- big snap shot [\#2034](https://github.com/danielgindi/Charts/issues/2034)
+- module file's minimum deployment target is ios9.3 [\#2031](https://github.com/danielgindi/Charts/issues/2031)
+- Date formatter doesn't show up properly when using multiple bars in a chart. [\#2030](https://github.com/danielgindi/Charts/issues/2030)
+- Y axis dynamic sampling ? [\#2029](https://github.com/danielgindi/Charts/issues/2029)
+- Convert line chart entry to take dictionary [\#2027](https://github.com/danielgindi/Charts/issues/2027)
+- How to set string value line \(27 Oct\) in xAxis [\#2025](https://github.com/danielgindi/Charts/issues/2025)
+- Build \[ChartsDemo\]  Error : 「ChartsRealm  Reason: image not found 」alaway [\#2024](https://github.com/danielgindi/Charts/issues/2024)
+- \[LineChartView\] setting xAxis.axisMinimum affects xAxis.spaceMin [\#2022](https://github.com/danielgindi/Charts/issues/2022)
+- c   vcgffrgfffgffgfgffffrfrfrrfdfdfdfdfdfdfggkjhghghghghjhjhjhjkjkjkkkklklklklikii0987654321poijkl;';lk;l; [\#2021](https://github.com/danielgindi/Charts/issues/2021)
+- How to make the highlight line work with UIPanGestureRecognizer [\#2019](https://github.com/danielgindi/Charts/issues/2019)
+- BarChart Issue for plotting the value on x-axis serially  [\#2017](https://github.com/danielgindi/Charts/issues/2017)
+- Please help me with the Pie Charts in Charts 3.0.1. [\#2016](https://github.com/danielgindi/Charts/issues/2016)
+- ipa becomes larger after using Charts [\#2015](https://github.com/danielgindi/Charts/issues/2015)
+- BarChartView highlight issues [\#2014](https://github.com/danielgindi/Charts/issues/2014)
+- How to set up a line chart, the starting point of the distance from the left margin, border distance end points [\#2013](https://github.com/danielgindi/Charts/issues/2013)
+- mult bars not show all [\#2012](https://github.com/danielgindi/Charts/issues/2012)
+- how to change legend font size? [\#2011](https://github.com/danielgindi/Charts/issues/2011)
+- image instead of text in CenterText in pie chart [\#2010](https://github.com/danielgindi/Charts/issues/2010)
+- Change PieChart Center Color [\#2009](https://github.com/danielgindi/Charts/issues/2009)
+- Demo issues [\#2008](https://github.com/danielgindi/Charts/issues/2008)
+- How to display last label in X-Axis [\#2007](https://github.com/danielgindi/Charts/issues/2007)
+- One point different values on the axis X [\#2005](https://github.com/danielgindi/Charts/issues/2005)
+- Hide all text/labels/values in pieChart [\#2004](https://github.com/danielgindi/Charts/issues/2004)
+- it is not an issue. it is related to OHLC chart  [\#2003](https://github.com/danielgindi/Charts/issues/2003)
+- Disable PieChart Label in Chart [\#2002](https://github.com/danielgindi/Charts/issues/2002)
+- \[LineChartViewController stringForValue:axis:\] [\#2001](https://github.com/danielgindi/Charts/issues/2001)
+- Values are cut out of the window [\#2000](https://github.com/danielgindi/Charts/issues/2000)
+- XAxis in top AND bottom position [\#1999](https://github.com/danielgindi/Charts/issues/1999)
+- Can't compile under Xcode 8.1 with Swift 3.0 [\#1998](https://github.com/danielgindi/Charts/issues/1998)
+- Always display max 5 visible bars in BarChartView [\#1997](https://github.com/danielgindi/Charts/issues/1997)
+- I want touchpoint in the bar to do something [\#1996](https://github.com/danielgindi/Charts/issues/1996)
+- Is there any way to change chart data label from bottom of table to top? [\#1995](https://github.com/danielgindi/Charts/issues/1995)
+- Installation not clear, for me [\#1994](https://github.com/danielgindi/Charts/issues/1994)
+- Add space between bar chart [\#1993](https://github.com/danielgindi/Charts/issues/1993)
+- How to fix the distance between each point on the X-coordinate? [\#1992](https://github.com/danielgindi/Charts/issues/1992)
+-  How to add tips to RadarChartView [\#1991](https://github.com/danielgindi/Charts/issues/1991)
+- Piechart issue [\#1990](https://github.com/danielgindi/Charts/issues/1990)
+- Multiple colors issue in stacked bar line charts swift3 [\#1989](https://github.com/danielgindi/Charts/issues/1989)
+- ChartViewDelegate is not called. [\#1988](https://github.com/danielgindi/Charts/issues/1988)
+- Always display vertical scrolling indicator on horizontal bar chart [\#1987](https://github.com/danielgindi/Charts/issues/1987)
+- Can't compile DemoProject [\#1986](https://github.com/danielgindi/Charts/issues/1986)
+- My pie chart legends still not showing [\#1985](https://github.com/danielgindi/Charts/issues/1985)
+- no yValCount in ChartData [\#1982](https://github.com/danielgindi/Charts/issues/1982)
+- no limitLineSegmentsBuffer in YAxisRenderer [\#1981](https://github.com/danielgindi/Charts/issues/1981)
+- Legend label missing in pie chart [\#1980](https://github.com/danielgindi/Charts/issues/1980)
+- For X axis the values are not adding [\#1979](https://github.com/danielgindi/Charts/issues/1979)
+- When I have two data, charts shows the three data automatically [\#1978](https://github.com/danielgindi/Charts/issues/1978)
+- Two legends for stacked bar chart [\#1977](https://github.com/danielgindi/Charts/issues/1977)
+- X axis coordinate point spacing [\#1975](https://github.com/danielgindi/Charts/issues/1975)
+- Carthage was not found [\#1974](https://github.com/danielgindi/Charts/issues/1974)
+- How to Show XAxis Label On YAxis Bar In BarView Charts? [\#1973](https://github.com/danielgindi/Charts/issues/1973)
+- Labels on Mac OS X application : place and title [\#1972](https://github.com/danielgindi/Charts/issues/1972)
+- I am gettign @import AppKit is missing in Charts-Swift.h under charts.framework [\#1971](https://github.com/danielgindi/Charts/issues/1971)
+- Multiline chart with common data point [\#1970](https://github.com/danielgindi/Charts/issues/1970)
+- Version 3.0.1: Fill gradient fills out the wrong side of the chart [\#1968](https://github.com/danielgindi/Charts/issues/1968)
+- How to pass data to the X axis?? [\#1967](https://github.com/danielgindi/Charts/issues/1967)
+- How do I implement a legend click event? [\#1965](https://github.com/danielgindi/Charts/issues/1965)
+- can't set the XVals [\#1964](https://github.com/danielgindi/Charts/issues/1964)
+- Color for Legend label [\#1962](https://github.com/danielgindi/Charts/issues/1962)
+- Two y axis plot on a side? [\#1961](https://github.com/danielgindi/Charts/issues/1961)
+- Scrolling feature? [\#1960](https://github.com/danielgindi/Charts/issues/1960)
+- Can you add the chart Of the triangle？ [\#1958](https://github.com/danielgindi/Charts/issues/1958)
+- Multiple y-data for single x-index [\#1955](https://github.com/danielgindi/Charts/issues/1955)
+- LineChartView: axisMaximum and axisMinimum work wrong in rightAxis [\#1953](https://github.com/danielgindi/Charts/issues/1953)
+- Radar Chart axis maximum [\#1952](https://github.com/danielgindi/Charts/issues/1952)
+- Adding a single x-axis label for two data points. [\#1951](https://github.com/danielgindi/Charts/issues/1951)
+- Adding title to X-axis and Y-axis [\#1950](https://github.com/danielgindi/Charts/issues/1950)
+- Find screen location for bars in a bar chart [\#1949](https://github.com/danielgindi/Charts/issues/1949)
+- \(3.0 Regression\) Scatter chart cuts off data at the edges [\#1946](https://github.com/danielgindi/Charts/issues/1946)
+- How automatic showing marker？ [\#1944](https://github.com/danielgindi/Charts/issues/1944)
+- Right and left margins [\#1942](https://github.com/danielgindi/Charts/issues/1942)
+- Displaying an overlay with extra / more detailed information on mouse hover [\#1940](https://github.com/danielgindi/Charts/issues/1940)
+- Can we have flexible y Axis scale [\#1939](https://github.com/danielgindi/Charts/issues/1939)
+- Charts3.0 - Can not show all the xAxis label if more than 8 value - Swift [\#1938](https://github.com/danielgindi/Charts/issues/1938)
+- Barchart xAxis interval [\#1937](https://github.com/danielgindi/Charts/issues/1937)
+- Avoiding chart legend [\#1936](https://github.com/danielgindi/Charts/issues/1936)
+- Module compiled with Swift 2.3 cannot be imported in Swift 3.0.1 [\#1935](https://github.com/danielgindi/Charts/issues/1935)
+- Charts-2.3.0/Source/ChartsRealm/Data/RealmPieData.swift:19:8: No such module 'Realm' [\#1934](https://github.com/danielgindi/Charts/issues/1934)
+- iOS Demo Fails to build [\#1933](https://github.com/danielgindi/Charts/issues/1933)
+- Pie chart Outside values, Inside Value and legend value [\#1932](https://github.com/danielgindi/Charts/issues/1932)
+- Mermory Leak in "specialized ChartXAxisRenderer.drawLabels\(context : CGContext, pos : CGFloat, anchor : CGPoint\) -\> \(\)" [\#1928](https://github.com/danielgindi/Charts/issues/1928)
+- stringForValue method return unexpected value when reload TableView data. [\#1927](https://github.com/danielgindi/Charts/issues/1927)
+- Can't render CombinedChartView [\#1926](https://github.com/danielgindi/Charts/issues/1926)
+- Migration to Chart 3.0, Problem with Stack BarChartView [\#1925](https://github.com/danielgindi/Charts/issues/1925)
+- PieChartData issue in Swift 3 [\#1924](https://github.com/danielgindi/Charts/issues/1924)
+- Values overlap for bar chart and labels of X-Axis [\#1923](https://github.com/danielgindi/Charts/issues/1923)
+- Please Please Help, I can’t get Charts installed properly [\#1922](https://github.com/danielgindi/Charts/issues/1922)
+- Chart bar finance \(OHLC Chart\) [\#1921](https://github.com/danielgindi/Charts/issues/1921)
+- Double value cannot be converted to Int in AxisRendererBase.swift on line 125 [\#1920](https://github.com/danielgindi/Charts/issues/1920)
+- Highlighted values on piechart too high? [\#1919](https://github.com/danielgindi/Charts/issues/1919)
+- How to achieve this effect? [\#1918](https://github.com/danielgindi/Charts/issues/1918)
+- SOLVED: Round number less than zero x values issue [\#1916](https://github.com/danielgindi/Charts/issues/1916)
+- Charts does not install correctly [\#1915](https://github.com/danielgindi/Charts/issues/1915)
+- Xcode 8.1 is reporting 'No such Module 'Charts' & Build/Compilation Errors [\#1914](https://github.com/danielgindi/Charts/issues/1914)
+- Hide legend [\#1913](https://github.com/danielgindi/Charts/issues/1913)
+- xAxis force show last label [\#1912](https://github.com/danielgindi/Charts/issues/1912)
+- How to install in Xcode 7.3.1 [\#1911](https://github.com/danielgindi/Charts/issues/1911)
+- Can we resurrect Chart2.2.5-Swift3.0?  [\#1910](https://github.com/danielgindi/Charts/issues/1910)
+- Chart Swift files not running on Obj-C XCODE8.0 install [\#1908](https://github.com/danielgindi/Charts/issues/1908)
+- How to draw two circles and compare？ [\#1906](https://github.com/danielgindi/Charts/issues/1906)
+- custom xAxis for line chart I need an example [\#1905](https://github.com/danielgindi/Charts/issues/1905)
+- QUESTION - How mask the ranges values in a Graph [\#1904](https://github.com/danielgindi/Charts/issues/1904)
+- How to give xAxis customized labels for linechartview [\#1903](https://github.com/danielgindi/Charts/issues/1903)
+- How to set the axis options of radar chart? [\#1902](https://github.com/danielgindi/Charts/issues/1902)
+- no match color bar chart with label [\#1900](https://github.com/danielgindi/Charts/issues/1900)
+- LineChartView  highlightEnabled no work [\#1899](https://github.com/danielgindi/Charts/issues/1899)
+- Can i change the value Above bar from double to int? [\#1898](https://github.com/danielgindi/Charts/issues/1898)
+- Scrolling x-axis labels [\#1897](https://github.com/danielgindi/Charts/issues/1897)
+- noDataText doesn't work on CombinedChart \(works fine on PieChart and BarChart\) [\#1896](https://github.com/danielgindi/Charts/issues/1896)
+- StringForValue in class IValueFormatter receives dataSetIndex as 0 [\#1895](https://github.com/danielgindi/Charts/issues/1895)
+- Cannot build in big project using cocoapods [\#1894](https://github.com/danielgindi/Charts/issues/1894)
+- Carthage build error with xcode 8.1 and  Charts 2.3.0  [\#1893](https://github.com/danielgindi/Charts/issues/1893)
+- Unable to select BarChartView from storyboard \(iOS\) [\#1892](https://github.com/danielgindi/Charts/issues/1892)
+- XAxis entry count is greater than it should be. [\#1890](https://github.com/danielgindi/Charts/issues/1890)
+- pod update failed - ARC Semantic Issue [\#1888](https://github.com/danielgindi/Charts/issues/1888)
+- How to show marker on y-Axis data? [\#1887](https://github.com/danielgindi/Charts/issues/1887)
+- Can't building and run the ChartsDemo [\#1886](https://github.com/danielgindi/Charts/issues/1886)
+- how to resolve label overlapping problem with stack bar chart [\#1885](https://github.com/danielgindi/Charts/issues/1885)
+- PieChart values [\#1884](https://github.com/danielgindi/Charts/issues/1884)
+- Custom marker gets displayed wrong on the latest value [\#1883](https://github.com/danielgindi/Charts/issues/1883)
+- Tap gesture inside the candle bar [\#1882](https://github.com/danielgindi/Charts/issues/1882)
+- rotating chartview [\#1881](https://github.com/danielgindi/Charts/issues/1881)
+- \[Question\] Scatter Chart && Bubble Chart: How to show out whole radius instead of hiding half radius of first data entry? [\#1879](https://github.com/danielgindi/Charts/issues/1879)
+- Horizontal bar chart dose not show all xAxis labels.  [\#1878](https://github.com/danielgindi/Charts/issues/1878)
+- X axis values [\#1877](https://github.com/danielgindi/Charts/issues/1877)
+- Pie Chart no xAxis [\#1875](https://github.com/danielgindi/Charts/issues/1875)
+- want the demo application in swift 3.0 for Charts [\#1872](https://github.com/danielgindi/Charts/issues/1872)
+- Pie Bar Chart issues [\#1870](https://github.com/danielgindi/Charts/issues/1870)
+- PieChartView a strange arrow [\#1869](https://github.com/danielgindi/Charts/issues/1869)
+- custom  gradient color of BarChatView [\#1868](https://github.com/danielgindi/Charts/issues/1868)
+- Set space between labels in xAxis [\#1865](https://github.com/danielgindi/Charts/issues/1865)
+- label over sample point [\#1864](https://github.com/danielgindi/Charts/issues/1864)
+- Realtime Scatterplot crashes when each ChartDataEntry is added dynamically on ScatterView.data [\#1863](https://github.com/danielgindi/Charts/issues/1863)
+- Assign Bar Colours Selectively [\#1862](https://github.com/danielgindi/Charts/issues/1862)
+- Detect when finger leaves the chart area [\#1861](https://github.com/danielgindi/Charts/issues/1861)
+- Pie chart touch event conflict [\#1860](https://github.com/danielgindi/Charts/issues/1860)
+- Customize X-axis and grid lines [\#1859](https://github.com/danielgindi/Charts/issues/1859)
+- Issue with candle stick when used in combined chart [\#1858](https://github.com/danielgindi/Charts/issues/1858)
+- CandleStick Background Color [\#1857](https://github.com/danielgindi/Charts/issues/1857)
+- Line Support Gradient Color? [\#1856](https://github.com/danielgindi/Charts/issues/1856)
+- Piechart has no xAxis? [\#1855](https://github.com/danielgindi/Charts/issues/1855)
+- Retain cycle setting delegate to valueFormatter [\#1854](https://github.com/danielgindi/Charts/issues/1854)
+- how to show Xaxis label value as my array value [\#1852](https://github.com/danielgindi/Charts/issues/1852)
+- Skip Drawing Circles for LineCharts [\#1795](https://github.com/danielgindi/Charts/issues/1795)
+- Realm update [\#1789](https://github.com/danielgindi/Charts/issues/1789)
+- "Module compiled with Swift 3.0 cannot be imported in Swift 3.0.1" [\#1788](https://github.com/danielgindi/Charts/issues/1788)
+- Move Realm integration to another repository [\#1756](https://github.com/danielgindi/Charts/issues/1756)
+- limit line real time update [\#1755](https://github.com/danielgindi/Charts/issues/1755)
+- Travis does not use github token for pull request build [\#1734](https://github.com/danielgindi/Charts/issues/1734)
+- custom string value at top of bar. [\#1109](https://github.com/danielgindi/Charts/issues/1109)
+
+**Merged pull requests:**
+
+- Minor typo fix in console alert message "it's" -\> "its" [\#2301](https://github.com/danielgindi/Charts/pull/2301) ([simonbromberg](https://github.com/simonbromberg))
+- Fix Xcode 8.3 compiler warnings [\#2279](https://github.com/danielgindi/Charts/pull/2279) ([krbarnes](https://github.com/krbarnes))
+- Updated to use Realm version 2.4.3 [\#2199](https://github.com/danielgindi/Charts/pull/2199) ([kimdv](https://github.com/kimdv))
+- Fixed the inconsistency of AxisMax and AxisMin [\#2177](https://github.com/danielgindi/Charts/pull/2177) ([aelam](https://github.com/aelam))
+- Fixes index out of range crash. [\#2167](https://github.com/danielgindi/Charts/pull/2167) ([kzaher](https://github.com/kzaher))
+- remove deprecation warnings in XCode 8.3  [\#2162](https://github.com/danielgindi/Charts/pull/2162) ([LeviDahl](https://github.com/LeviDahl))
+- 'backgroundColor' is inaccessible due to 'internal' protection level … [\#2156](https://github.com/danielgindi/Charts/pull/2156) ([thierryH91200](https://github.com/thierryH91200))
+- Fixes Xcode 8.3 beta build issue [\#2116](https://github.com/danielgindi/Charts/pull/2116) ([davidarve](https://github.com/davidarve))
+- Adds NSPhotoLibraryUsageDescription to plist of ChartsDemo [\#2101](https://github.com/danielgindi/Charts/pull/2101) ([valeriyvan](https://github.com/valeriyvan))
+- Fix demo and test targets not running/testing [\#2084](https://github.com/danielgindi/Charts/pull/2084) ([petester42](https://github.com/petester42))
+- fix a typo, as orientation is horizontal by default [\#2078](https://github.com/danielgindi/Charts/pull/2078) ([liuxuan30](https://github.com/liuxuan30))
+- Update Podspec RealmSwift Dependency to 2.1.1 to be in line with Cartfile [\#2064](https://github.com/danielgindi/Charts/pull/2064) ([anttyc](https://github.com/anttyc))
+- Fix NSCopying implementation in CandleChartDataEntry [\#2056](https://github.com/danielgindi/Charts/pull/2056) ([leo150](https://github.com/leo150))
+- Add support for extensions [\#2048](https://github.com/danielgindi/Charts/pull/2048) ([raptorxcz](https://github.com/raptorxcz))
+- Update "Usage" section of README [\#1984](https://github.com/danielgindi/Charts/pull/1984) ([elaewin](https://github.com/elaewin))
+- All Charts Icons Support Swift3 \[Dub \#629, \#624, \#1261\] [\#1793](https://github.com/danielgindi/Charts/pull/1793) ([abjurato](https://github.com/abjurato))
+
+## [3.0.1](https://github.com/danielgindi/Charts/tree/3.0.1) (2016-11-20)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.0.1...3.0.1)
+
+## [v3.0.1](https://github.com/danielgindi/Charts/tree/v3.0.1) (2016-11-20)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/2.3.1...v3.0.1)
 
 **Closed issues:**
 
 - Legend under the bar in bar Chart [\#1850](https://github.com/danielgindi/Charts/issues/1850)
 - MultipleBarChart barSpace does not work [\#1849](https://github.com/danielgindi/Charts/issues/1849)
 - Can not show decimal in y value on BarChart [\#1848](https://github.com/danielgindi/Charts/issues/1848)
-- Charts 3: Horizontally scrolling BarChart in a vertically scrolling UIScrollView? [\#1847](https://github.com/danielgindi/Charts/issues/1847)
 - Cannot add labels to a simple Bar Chart [\#1846](https://github.com/danielgindi/Charts/issues/1846)
 - when running my project on iphone device but not simulator it has error"image not found" [\#1845](https://github.com/danielgindi/Charts/issues/1845)
 - Removing red selector cross on Line Chart nodes [\#1844](https://github.com/danielgindi/Charts/issues/1844)
@@ -21,7 +1927,6 @@
 - Migration to Swift 3.x [\#1836](https://github.com/danielgindi/Charts/issues/1836)
 - How to hide BarChart hide bottom  description  color & text ? [\#1835](https://github.com/danielgindi/Charts/issues/1835)
 -  please help Line Graph not working on Charts 2.3.0 \(for Xcode8 and Swift 2.3.0\) [\#1834](https://github.com/danielgindi/Charts/issues/1834)
-- it will crash when i insert  data on RadarChart [\#1833](https://github.com/danielgindi/Charts/issues/1833)
 - Error when adding embedded binaries [\#1832](https://github.com/danielgindi/Charts/issues/1832)
 - X-Axis for different different charts [\#1831](https://github.com/danielgindi/Charts/issues/1831)
 - Setting values label [\#1829](https://github.com/danielgindi/Charts/issues/1829)
@@ -74,8 +1979,11 @@
 
 - Added a check against NaN [\#1733](https://github.com/danielgindi/Charts/pull/1733) ([Selficide](https://github.com/Selficide))
 
-## [v2.3.1](https://github.com/danielgindi/charts/tree/v2.3.1) (2016-11-04)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v3.0.0...v2.3.1)
+## [2.3.1](https://github.com/danielgindi/Charts/tree/2.3.1) (2016-11-04)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.3.1...2.3.1)
+
+## [v2.3.1](https://github.com/danielgindi/Charts/tree/v2.3.1) (2016-11-04)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/3.0.0...v2.3.1)
 
 **Fixed bugs:**
 
@@ -95,7 +2003,6 @@
 - BarChartView - The first column and last column show only half? [\#1772](https://github.com/danielgindi/Charts/issues/1772)
 - Stacked Bar Chart Opacity of Some Colors [\#1769](https://github.com/danielgindi/Charts/issues/1769)
 - Custom Format YAxis [\#1768](https://github.com/danielgindi/Charts/issues/1768)
-- Charts 3.0 how set xAxis gridline between bars like before? [\#1766](https://github.com/danielgindi/Charts/issues/1766)
 - to run ChartsDemo [\#1765](https://github.com/danielgindi/Charts/issues/1765)
 - There is something wrong with LineChartView,ChartDataEntry,LineChartData and ChartDataEntry [\#1764](https://github.com/danielgindi/Charts/issues/1764)
 - Strange margin/space in a grouped BarChart [\#1763](https://github.com/danielgindi/Charts/issues/1763)
@@ -181,8 +2088,11 @@
 - Updated Width Constraints - Fixes \#1770 [\#1771](https://github.com/danielgindi/Charts/pull/1771) ([SumoSimo](https://github.com/SumoSimo))
 - update cocoapods [\#1684](https://github.com/danielgindi/Charts/pull/1684) ([petester42](https://github.com/petester42))
 
-## [v3.0.0](https://github.com/danielgindi/charts/tree/v3.0.0) (2016-10-19)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.3.0...v3.0.0)
+## [3.0.0](https://github.com/danielgindi/Charts/tree/3.0.0) (2016-10-19)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v3.0.0...3.0.0)
+
+## [v3.0.0](https://github.com/danielgindi/Charts/tree/v3.0.0) (2016-10-19)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/2.3.0...v3.0.0)
 
 **Implemented enhancements:**
 
@@ -196,7 +2106,6 @@
 - Misplaced  Radar Marker  [\#1556](https://github.com/danielgindi/Charts/issues/1556)
 - fatal error: Double value cannot be converted to Int because it is either infinite or NaN [\#1550](https://github.com/danielgindi/Charts/issues/1550)
 - Problem with the xValue begins at 0 [\#1547](https://github.com/danielgindi/Charts/issues/1547)
-- \(v3.0 + Swift3.0\)ChartView highlightValueWithX not working [\#1495](https://github.com/danielgindi/Charts/issues/1495)
 - \(v3.0 + Swift3.0\)LineChart crash when dataSets is a empty array [\#1491](https://github.com/danielgindi/Charts/issues/1491)
 - \(v3.0 + swift3.0\) charts' top are cropped/overlapped in ChartsDemo [\#1489](https://github.com/danielgindi/Charts/issues/1489)
 - \(v3.0 + Swift3.0\) Time Line Chart Demo crash [\#1488](https://github.com/danielgindi/Charts/issues/1488)
@@ -379,8 +2288,11 @@
 - Attempt to make CI more stable [\#1510](https://github.com/danielgindi/Charts/pull/1510) ([petester42](https://github.com/petester42))
 - Fix Cocoapods setup being broken [\#1509](https://github.com/danielgindi/Charts/pull/1509) ([petester42](https://github.com/petester42))
 
-## [v2.3.0](https://github.com/danielgindi/charts/tree/v2.3.0) (2016-09-21)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.2.5...v2.3.0)
+## [2.3.0](https://github.com/danielgindi/Charts/tree/2.3.0) (2016-09-21)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.3.0...2.3.0)
+
+## [v2.3.0](https://github.com/danielgindi/Charts/tree/v2.3.0) (2016-09-21)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.2.5...v2.3.0)
 
 **Implemented enhancements:**
 
@@ -734,8 +2646,8 @@
 - Swift 2.3 [\#1163](https://github.com/danielgindi/Charts/pull/1163) ([liuxuan30](https://github.com/liuxuan30))
 - Ignoring .DS\_Store files [\#1130](https://github.com/danielgindi/Charts/pull/1130) ([einsteinx2](https://github.com/einsteinx2))
 
-## [v2.2.5](https://github.com/danielgindi/charts/tree/v2.2.5) (2016-05-30)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.2.4...v2.2.5)
+## [v2.2.5](https://github.com/danielgindi/Charts/tree/v2.2.5) (2016-05-30)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.2.4...v2.2.5)
 
 **Implemented enhancements:**
 
@@ -911,8 +2823,8 @@
 - Some minor nits [\#913](https://github.com/danielgindi/Charts/pull/913) ([ruurd](https://github.com/ruurd))
 - add a switch whether to draw limit line's labels. default is true [\#887](https://github.com/danielgindi/Charts/pull/887) ([liuxuan30](https://github.com/liuxuan30))
 
-## [v2.2.4](https://github.com/danielgindi/charts/tree/v2.2.4) (2016-03-31)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.2.3...v2.2.4)
+## [v2.2.4](https://github.com/danielgindi/Charts/tree/v2.2.4) (2016-03-31)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.2.3...v2.2.4)
 
 **Fixed bugs:**
 
@@ -1034,8 +2946,8 @@
 - Set code signing identity for iOS targets [\#811](https://github.com/danielgindi/Charts/pull/811) ([krbarnes](https://github.com/krbarnes))
 - Add trailing newline for preprocessor statement [\#795](https://github.com/danielgindi/Charts/pull/795) ([boourns](https://github.com/boourns))
 
-## [v2.2.3](https://github.com/danielgindi/charts/tree/v2.2.3) (2016-02-29)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.2.2...v2.2.3)
+## [v2.2.3](https://github.com/danielgindi/Charts/tree/v2.2.3) (2016-02-29)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.2.2...v2.2.3)
 
 **Closed issues:**
 
@@ -1075,8 +2987,8 @@
 - Fix for cubic line chart fill when charts that don't start at x-index 0 \#711 [\#712](https://github.com/danielgindi/Charts/pull/712) ([gunterhager](https://github.com/gunterhager))
 - add support for lineCap setting for line chart [\#658](https://github.com/danielgindi/Charts/pull/658) ([liuxuan30](https://github.com/liuxuan30))
 
-## [v2.2.2](https://github.com/danielgindi/charts/tree/v2.2.2) (2016-02-09)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.2.1...v2.2.2)
+## [v2.2.2](https://github.com/danielgindi/Charts/tree/v2.2.2) (2016-02-09)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.2.1...v2.2.2)
 
 **Fixed bugs:**
 
@@ -1093,8 +3005,11 @@
 - LineChartData omits and misaligns values when data isn't continuous [\#728](https://github.com/danielgindi/Charts/issues/728)
 - Apache license and correct attribution in an iOS app? [\#678](https://github.com/danielgindi/Charts/issues/678)
 
-## [v2.2.1](https://github.com/danielgindi/charts/tree/v2.2.1) (2016-02-01)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.2.0...v2.2.1)
+## [v2.2.1](https://github.com/danielgindi/Charts/tree/v2.2.1) (2016-02-01)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/2.2.1...v2.2.1)
+
+## [2.2.1](https://github.com/danielgindi/Charts/tree/2.2.1) (2016-02-01)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.2.0...2.2.1)
 
 **Fixed bugs:**
 
@@ -1118,8 +3033,8 @@
 
 - Update podspec for realm and 2.2.0 [\#725](https://github.com/danielgindi/Charts/pull/725) ([petester42](https://github.com/petester42))
 
-## [v2.2.0](https://github.com/danielgindi/charts/tree/v2.2.0) (2016-01-26)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.6...v2.2.0)
+## [v2.2.0](https://github.com/danielgindi/Charts/tree/v2.2.0) (2016-01-26)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.6...v2.2.0)
 
 **Fixed bugs:**
 
@@ -1250,7 +3165,7 @@
 
 **Merged pull requests:**
 
-- Activate require app extension safe API to be able to use library inside an app extension [\#708](https://github.com/danielgindi/Charts/pull/708) ([adonaire-sage](https://github.com/adonaire-sage))
+- Activate require app extension safe API to be able to use library inside an app extension [\#708](https://github.com/danielgindi/Charts/pull/708) ([ghost](https://github.com/ghost))
 - fix code indent problem in ChartYAxisRendererRadarChart, ChartYAxisRenderer, BarChartDataSet, RadarChartView [\#675](https://github.com/danielgindi/Charts/pull/675) ([liuxuan30](https://github.com/liuxuan30))
 - add an option to set line cap of axis grid line [\#660](https://github.com/danielgindi/Charts/pull/660) ([mconintet](https://github.com/mconintet))
 - Fix minor typo in BarLineChartViewBase [\#651](https://github.com/danielgindi/Charts/pull/651) ([patrickreynolds](https://github.com/patrickreynolds))
@@ -1265,11 +3180,11 @@
 - Add change log file. [\#605](https://github.com/danielgindi/Charts/pull/605) ([skywinder](https://github.com/skywinder))
 - add initialize dataSets in setter [\#600](https://github.com/danielgindi/Charts/pull/600) ([liuxuan30](https://github.com/liuxuan30))
 - Bar chart tests [\#580](https://github.com/danielgindi/Charts/pull/580) ([alvesjtiago](https://github.com/alvesjtiago))
-- Make getBarBounds callable from Objective-C code \(Fixes \#570\) [\#571](https://github.com/danielgindi/Charts/pull/571) ([adonaire-sage](https://github.com/adonaire-sage))
+- Make getBarBounds callable from Objective-C code \(Fixes \#570\) [\#571](https://github.com/danielgindi/Charts/pull/571) ([ghost](https://github.com/ghost))
 - round the float value before we cast to Int [\#558](https://github.com/danielgindi/Charts/pull/558) ([liuxuan30](https://github.com/liuxuan30))
 
-## [v2.1.6](https://github.com/danielgindi/charts/tree/v2.1.6) (2015-11-02)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.5...v2.1.6)
+## [v2.1.6](https://github.com/danielgindi/Charts/tree/v2.1.6) (2015-11-02)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.5...v2.1.6)
 
 **Implemented enhancements:**
 
@@ -1319,8 +3234,8 @@
 - Approved, pending styling: Fix Scroll issue when the graph is in a UITableView [\#464](https://github.com/danielgindi/Charts/pull/464) ([coupgar](https://github.com/coupgar))
 - Add ability to turn off antialias for grid lines [\#462](https://github.com/danielgindi/Charts/pull/462) ([vvit](https://github.com/vvit))
 
-## [v2.1.5](https://github.com/danielgindi/charts/tree/v2.1.5) (2015-10-15)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.4a...v2.1.5)
+## [v2.1.5](https://github.com/danielgindi/Charts/tree/v2.1.5) (2015-10-15)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.4a...v2.1.5)
 
 **Fixed bugs:**
 
@@ -1369,8 +3284,8 @@
 - Only alow scaling further if the user can still zoom \(Fixes \#437\) [\#438](https://github.com/danielgindi/Charts/pull/438) ([iangmaia](https://github.com/iangmaia))
 - Make the ChartXAxisRenderer more flexible: now possible to overwrite drawing the line or label of the ChartLimitLine [\#432](https://github.com/danielgindi/Charts/pull/432) ([pajai](https://github.com/pajai))
 
-## [v2.1.4a](https://github.com/danielgindi/charts/tree/v2.1.4a) (2015-10-02)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.4...v2.1.4a)
+## [v2.1.4a](https://github.com/danielgindi/Charts/tree/v2.1.4a) (2015-10-02)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.4...v2.1.4a)
 
 **Fixed bugs:**
 
@@ -1427,8 +3342,8 @@
 - Add target for tvOS and get it to compile [\#392](https://github.com/danielgindi/Charts/pull/392) ([icecrystal23](https://github.com/icecrystal23))
 - be explicit on how to install 'Charts' when using CocoaPods since [\#376](https://github.com/danielgindi/Charts/pull/376) ([codeHatcher](https://github.com/codeHatcher))
 
-## [v2.1.4](https://github.com/danielgindi/charts/tree/v2.1.4) (2015-09-21)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.3...v2.1.4)
+## [v2.1.4](https://github.com/danielgindi/Charts/tree/v2.1.4) (2015-09-21)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.3...v2.1.4)
 
 **Fixed bugs:**
 
@@ -1520,8 +3435,8 @@
 - Minor refactor for BarLineChartViewBase [\#268](https://github.com/danielgindi/Charts/pull/268) ([liuxuan30](https://github.com/liuxuan30))
 - Enhanced label positioning at limit lines \(enum ChartLimitLabelPosition\) [\#243](https://github.com/danielgindi/Charts/pull/243) ([SvenMuc](https://github.com/SvenMuc))
 
-## [v2.1.3](https://github.com/danielgindi/charts/tree/v2.1.3) (2015-08-05)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.2...v2.1.3)
+## [v2.1.3](https://github.com/danielgindi/Charts/tree/v2.1.3) (2015-08-05)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.2...v2.1.3)
 
 **Closed issues:**
 
@@ -1555,11 +3470,11 @@
 - Updated podspec [\#254](https://github.com/danielgindi/Charts/pull/254) ([petester42](https://github.com/petester42))
 - try to fix bar chart + Horizontal Bar chart wrong render + highlight position bug for issue \#214 and \#242. [\#248](https://github.com/danielgindi/Charts/pull/248) ([liuxuan30](https://github.com/liuxuan30))
 
-## [v2.1.2](https://github.com/danielgindi/charts/tree/v2.1.2) (2015-07-26)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.1...v2.1.2)
+## [v2.1.2](https://github.com/danielgindi/Charts/tree/v2.1.2) (2015-07-26)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.1...v2.1.2)
 
-## [v2.1.1](https://github.com/danielgindi/charts/tree/v2.1.1) (2015-07-26)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.1.0...v2.1.1)
+## [v2.1.1](https://github.com/danielgindi/Charts/tree/v2.1.1) (2015-07-26)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.1.0...v2.1.1)
 
 **Fixed bugs:**
 
@@ -1695,8 +3610,8 @@
 - Allow access to setLabelsToSkip from Objective-C. [\#93](https://github.com/danielgindi/Charts/pull/93) ([mkubenka](https://github.com/mkubenka))
 - Changing iOS deployment target to 8.0 from 8.1 [\#74](https://github.com/danielgindi/Charts/pull/74) ([michaelmcguire](https://github.com/michaelmcguire))
 
-## [v2.1.0](https://github.com/danielgindi/charts/tree/v2.1.0) (2015-05-05)
-[Full Changelog](https://github.com/danielgindi/charts/compare/v2.0.9...v2.1.0)
+## [v2.1.0](https://github.com/danielgindi/Charts/tree/v2.1.0) (2015-05-05)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/v2.0.9...v2.1.0)
 
 **Implemented enhancements:**
 
@@ -1752,8 +3667,8 @@
 - Shared Charts.framework scheme [\#22](https://github.com/danielgindi/Charts/pull/22) ([zenkimoto](https://github.com/zenkimoto))
 - Add missing UIKit [\#20](https://github.com/danielgindi/Charts/pull/20) ([mkalmes](https://github.com/mkalmes))
 
-## [v2.0.9](https://github.com/danielgindi/charts/tree/v2.0.9) (2015-04-08)
-[Full Changelog](https://github.com/danielgindi/charts/compare/0.0.1...v2.0.9)
+## [v2.0.9](https://github.com/danielgindi/Charts/tree/v2.0.9) (2015-04-08)
+[Full Changelog](https://github.com/danielgindi/Charts/compare/0.0.1...v2.0.9)
 
 **Closed issues:**
 
@@ -1763,7 +3678,7 @@
 
 - Added a podspec [\#13](https://github.com/danielgindi/Charts/pull/13) ([petester42](https://github.com/petester42))
 
-## [0.0.1](https://github.com/danielgindi/charts/tree/0.0.1) (2015-04-07)
+## [0.0.1](https://github.com/danielgindi/Charts/tree/0.0.1) (2015-04-07)
 **Closed issues:**
 
 - Need Version to be compatible with Xcode 6.2  [\#12](https://github.com/danielgindi/Charts/issues/12)
diff --git a/Cartfile b/Cartfile
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Cartfile.private b/Cartfile.private
index a27f21f92d..ca931038c5 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1 +1 @@
-github "facebook/ios-snapshot-test-case" "master"
+github "uber/ios-snapshot-test-case"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index e6cc748142..8f69010a98 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "facebook/ios-snapshot-test-case" "c1808fb4435ffc3db2203e7623935f39fc31aa8f"
+github "uber/ios-snapshot-test-case" "6.1.0"
diff --git a/Carthage.xcconfig b/Carthage.xcconfig
deleted file mode 100644
index 1b9b96db98..0000000000
--- a/Carthage.xcconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  Carthage.xcconfig
-//  Charts
-//
-//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
-//  A port of MPAndroidChart for iOS
-//  Licensed under Apache License 2.0
-//
-//  https://github.com/danielgindi/Charts
-//
-
-FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(SRCROOT)/Carthage/Build/Mac/ $(inherited)
-FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/Carthage/Build/iOS/ $(inherited)
-FRAMEWORK_SEARCH_PATHS[sdk=watch*] = $(SRCROOT)/Carthage/Build/watchOS/ $(inherited)
-FRAMEWORK_SEARCH_PATHS[sdk=appletv*] = $(SRCROOT)/Carthage/Build/tvOS/ $(inherited)
diff --git a/ChartDataTests.swift b/ChartDataTests.swift
new file mode 100644
index 0000000000..4e4cdbab94
--- /dev/null
+++ b/ChartDataTests.swift
@@ -0,0 +1,69 @@
+//
+//  ChartDataTests.swift
+//  ChartsTests
+//
+//  Created by Peter Kaminski on 1/23/20.
+//
+
+import XCTest
+@testable import Charts
+
+class ChartDataTests: XCTestCase {
+    
+    var data: ScatterChartData!
+
+    private enum SetLabels {
+        static let one = "label1"
+        static let two = "label2"
+        static let three = "label3"
+        static let badLabel = "Bad label"
+    }
+    
+    override func setUp() {
+        super.setUp()
+        
+        let setCount = 5
+        let range: UInt32 = 32
+        let values1 = (0..<setCount).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        let values2 = (0..<setCount).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        let values3 = (0..<setCount).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        
+        let set1 = ScatterChartDataSet(entries: values1, label: SetLabels.one)
+        let set2 = ScatterChartDataSet(entries: values2, label: SetLabels.two)
+        let set3 = ScatterChartDataSet(entries: values3, label: SetLabels.three)
+        
+        data = ScatterChartData(dataSets: [set1, set2, set3])
+    }
+    
+    func testGetDataSetByLabelCaseSensitive() {
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.one, ignorecase: false)?.label == SetLabels.one)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.two, ignorecase: false)?.label == SetLabels.two)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.three, ignorecase: false)?.label == SetLabels.three)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.one.uppercased(), ignorecase: false) == nil)
+    }
+    
+    func testGetDataSetByLabelIgnoreCase() {
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.one, ignorecase: true)?.label == SetLabels.one)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.two, ignorecase: true)?.label == SetLabels.two)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.three, ignorecase: true)?.label == SetLabels.three)
+        
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.one.uppercased(), ignorecase: true)?.label == SetLabels.one)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.two.uppercased(), ignorecase: true)?.label == SetLabels.two)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.three.uppercased(), ignorecase: true)?.label == SetLabels.three)
+    }
+    
+    func testGetDataSetByLabelNilWithBadLabel() {
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.badLabel, ignorecase: true) == nil)
+        XCTAssertTrue(data.getDataSetByLabel(SetLabels.badLabel, ignorecase: false) == nil)
+    }
+}
+
diff --git a/Charts.podspec b/Charts.podspec
index 22d8f68630..bf0dcf37f6 100644
--- a/Charts.podspec
+++ b/Charts.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "Charts"
-  s.version = "3.0.2"
+  s.version = "3.4.0"
   s.summary = "Charts is a powerful & easy to use chart library for iOS, tvOS and OSX (and Android)"
   s.homepage = "https://github.com/danielgindi/Charts"
   s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -10,6 +10,8 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.11"
   s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
   s.default_subspec = "Core"
+  s.swift_version = '5.0'
+  s.cocoapods_version = '>= 1.5.0'
 
   s.subspec "Core" do |ss|
     ss.source_files  = "Source/Charts/**/*.swift"
diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
index cd1b497477..fbc4e7478d 100644
--- a/Charts.xcodeproj/project.pbxproj
+++ b/Charts.xcodeproj/project.pbxproj
@@ -7,684 +7,714 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		06165F2F1D8110E600722320 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06165F241D8110E600722320 /* Charts.framework */; };
-		06761B5E1D98176000D5CE09 /* ChartUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06761B5D1D98176000D5CE09 /* ChartUtilsTests.swift */; };
-		06B11FAF1D811B7000D14B02 /* Charts.h in Headers */ = {isa = PBXBuildFile; fileRef = 06B11FAE1D811B7000D14B02 /* Charts.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		06B120431D811B8900D14B02 /* Animator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB11D811B8900D14B02 /* Animator.swift */; };
-		06B120441D811B8900D14B02 /* ChartAnimationEasing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB21D811B8900D14B02 /* ChartAnimationEasing.swift */; };
-		06B120451D811B8900D14B02 /* BarChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB41D811B8900D14B02 /* BarChartView.swift */; };
-		06B120461D811B8900D14B02 /* BarLineChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB51D811B8900D14B02 /* BarLineChartViewBase.swift */; };
-		06B120471D811B8900D14B02 /* BubbleChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB61D811B8900D14B02 /* BubbleChartView.swift */; };
-		06B120481D811B8900D14B02 /* CandleStickChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB71D811B8900D14B02 /* CandleStickChartView.swift */; };
-		06B120491D811B8900D14B02 /* ChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB81D811B8900D14B02 /* ChartViewBase.swift */; };
-		06B1204A1D811B8900D14B02 /* CombinedChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FB91D811B8900D14B02 /* CombinedChartView.swift */; };
-		06B1204B1D811B8900D14B02 /* HorizontalBarChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FBA1D811B8900D14B02 /* HorizontalBarChartView.swift */; };
-		06B1204C1D811B8900D14B02 /* LineChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FBB1D811B8900D14B02 /* LineChartView.swift */; };
-		06B1204D1D811B8900D14B02 /* PieChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FBC1D811B8900D14B02 /* PieChartView.swift */; };
-		06B1204E1D811B8900D14B02 /* PieRadarChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FBD1D811B8900D14B02 /* PieRadarChartViewBase.swift */; };
-		06B1204F1D811B8900D14B02 /* RadarChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FBE1D811B8900D14B02 /* RadarChartView.swift */; };
-		06B120501D811B8900D14B02 /* ScatterChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FBF1D811B8900D14B02 /* ScatterChartView.swift */; };
-		06B120511D811B8900D14B02 /* AxisBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC11D811B8900D14B02 /* AxisBase.swift */; };
-		06B120521D811B8900D14B02 /* ChartLimitLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC21D811B8900D14B02 /* ChartLimitLine.swift */; };
-		06B120531D811B8900D14B02 /* ComponentBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC31D811B8900D14B02 /* ComponentBase.swift */; };
-		06B120541D811B8900D14B02 /* IMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC41D811B8900D14B02 /* IMarker.swift */; };
-		06B120551D811B8900D14B02 /* Legend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC51D811B8900D14B02 /* Legend.swift */; };
-		06B120561D811B8900D14B02 /* LegendEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC61D811B8900D14B02 /* LegendEntry.swift */; };
-		06B120571D811B8900D14B02 /* MarkerImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC71D811B8900D14B02 /* MarkerImage.swift */; };
-		06B120581D811B8900D14B02 /* MarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC81D811B8900D14B02 /* MarkerView.swift */; };
-		06B120591D811B8900D14B02 /* XAxis.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FC91D811B8900D14B02 /* XAxis.swift */; };
-		06B1205A1D811B8900D14B02 /* YAxis.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FCA1D811B8900D14B02 /* YAxis.swift */; };
-		06B1205B1D811B8900D14B02 /* ChartBaseDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FCD1D811B8900D14B02 /* ChartBaseDataSet.swift */; };
-		06B1205C1D811B8900D14B02 /* BarChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FCF1D811B8900D14B02 /* BarChartData.swift */; };
-		06B1205D1D811B8900D14B02 /* BarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD01D811B8900D14B02 /* BarChartDataEntry.swift */; };
-		06B1205E1D811B8900D14B02 /* BarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD11D811B8900D14B02 /* BarChartDataSet.swift */; };
-		06B1205F1D811B8900D14B02 /* BarLineScatterCandleBubbleChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD21D811B8900D14B02 /* BarLineScatterCandleBubbleChartData.swift */; };
-		06B120601D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD31D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataSet.swift */; };
-		06B120611D811B8900D14B02 /* BubbleChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD41D811B8900D14B02 /* BubbleChartData.swift */; };
-		06B120621D811B8900D14B02 /* BubbleChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD51D811B8900D14B02 /* BubbleChartDataEntry.swift */; };
-		06B120631D811B8900D14B02 /* BubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD61D811B8900D14B02 /* BubbleChartDataSet.swift */; };
-		06B120641D811B8900D14B02 /* CandleChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD71D811B8900D14B02 /* CandleChartData.swift */; };
-		06B120651D811B8900D14B02 /* CandleChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD81D811B8900D14B02 /* CandleChartDataEntry.swift */; };
-		06B120661D811B8900D14B02 /* CandleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FD91D811B8900D14B02 /* CandleChartDataSet.swift */; };
-		06B120671D811B8900D14B02 /* ChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FDA1D811B8900D14B02 /* ChartData.swift */; };
-		06B120681D811B8900D14B02 /* ChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FDB1D811B8900D14B02 /* ChartDataEntry.swift */; };
-		06B120691D811B8900D14B02 /* ChartDataEntryBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FDC1D811B8900D14B02 /* ChartDataEntryBase.swift */; };
-		06B1206A1D811B8900D14B02 /* ChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FDD1D811B8900D14B02 /* ChartDataSet.swift */; };
-		06B1206B1D811B8900D14B02 /* CombinedChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FDE1D811B8900D14B02 /* CombinedChartData.swift */; };
-		06B1206C1D811B8900D14B02 /* LineChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FDF1D811B8900D14B02 /* LineChartData.swift */; };
-		06B1206D1D811B8900D14B02 /* LineChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE01D811B8900D14B02 /* LineChartDataSet.swift */; };
-		06B1206E1D811B8900D14B02 /* LineRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE11D811B8900D14B02 /* LineRadarChartDataSet.swift */; };
-		06B1206F1D811B8900D14B02 /* LineScatterCandleRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE21D811B8900D14B02 /* LineScatterCandleRadarChartDataSet.swift */; };
-		06B120701D811B8900D14B02 /* PieChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE31D811B8900D14B02 /* PieChartData.swift */; };
-		06B120711D811B8900D14B02 /* PieChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE41D811B8900D14B02 /* PieChartDataEntry.swift */; };
-		06B120721D811B8900D14B02 /* PieChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE51D811B8900D14B02 /* PieChartDataSet.swift */; };
-		06B120731D811B8900D14B02 /* RadarChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE61D811B8900D14B02 /* RadarChartData.swift */; };
-		06B120741D811B8900D14B02 /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE71D811B8900D14B02 /* RadarChartDataEntry.swift */; };
-		06B120751D811B8900D14B02 /* RadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE81D811B8900D14B02 /* RadarChartDataSet.swift */; };
-		06B120761D811B8900D14B02 /* ScatterChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FE91D811B8900D14B02 /* ScatterChartData.swift */; };
-		06B120771D811B8900D14B02 /* ScatterChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FEA1D811B8900D14B02 /* ScatterChartDataSet.swift */; };
-		06B120781D811B8900D14B02 /* IBarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FEC1D811B8900D14B02 /* IBarChartDataSet.swift */; };
-		06B120791D811B8900D14B02 /* IBarLineScatterCandleBubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FED1D811B8900D14B02 /* IBarLineScatterCandleBubbleChartDataSet.swift */; };
-		06B1207A1D811B8900D14B02 /* IBubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FEE1D811B8900D14B02 /* IBubbleChartDataSet.swift */; };
-		06B1207B1D811B8900D14B02 /* ICandleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FEF1D811B8900D14B02 /* ICandleChartDataSet.swift */; };
-		06B1207C1D811B8900D14B02 /* IChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF01D811B8900D14B02 /* IChartDataSet.swift */; };
-		06B1207D1D811B8900D14B02 /* ILineChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF11D811B8900D14B02 /* ILineChartDataSet.swift */; };
-		06B1207E1D811B8900D14B02 /* ILineRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF21D811B8900D14B02 /* ILineRadarChartDataSet.swift */; };
-		06B1207F1D811B8900D14B02 /* ILineScatterCandleRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF31D811B8900D14B02 /* ILineScatterCandleRadarChartDataSet.swift */; };
-		06B120801D811B8900D14B02 /* IPieChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF41D811B8900D14B02 /* IPieChartDataSet.swift */; };
-		06B120811D811B8900D14B02 /* IRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF51D811B8900D14B02 /* IRadarChartDataSet.swift */; };
-		06B120821D811B8900D14B02 /* IScatterChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF61D811B8900D14B02 /* IScatterChartDataSet.swift */; };
-		06B120831D811B8900D14B02 /* DataApproximator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FF81D811B8900D14B02 /* DataApproximator.swift */; };
-		06B120841D811B8900D14B02 /* DefaultAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FFA1D811B8900D14B02 /* DefaultAxisValueFormatter.swift */; };
-		06B120851D811B8900D14B02 /* DefaultFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FFB1D811B8900D14B02 /* DefaultFillFormatter.swift */; };
-		06B120861D811B8900D14B02 /* DefaultValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FFC1D811B8900D14B02 /* DefaultValueFormatter.swift */; };
-		06B120871D811B8900D14B02 /* IAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FFD1D811B8900D14B02 /* IAxisValueFormatter.swift */; };
-		06B120881D811B8900D14B02 /* IFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FFE1D811B8900D14B02 /* IFillFormatter.swift */; };
-		06B120891D811B8900D14B02 /* IValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B11FFF1D811B8900D14B02 /* IValueFormatter.swift */; };
-		06B1208A1D811B8900D14B02 /* BarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120011D811B8900D14B02 /* BarHighlighter.swift */; };
-		06B1208B1D811B8900D14B02 /* ChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120021D811B8900D14B02 /* ChartHighlighter.swift */; };
-		06B1208C1D811B8900D14B02 /* CombinedHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120031D811B8900D14B02 /* CombinedHighlighter.swift */; };
-		06B1208D1D811B8900D14B02 /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120041D811B8900D14B02 /* Highlight.swift */; };
-		06B1208E1D811B8900D14B02 /* HorizontalBarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120051D811B8900D14B02 /* HorizontalBarHighlighter.swift */; };
-		06B1208F1D811B8900D14B02 /* IHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120061D811B8900D14B02 /* IHighlighter.swift */; };
-		06B120901D811B8900D14B02 /* PieHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120071D811B8900D14B02 /* PieHighlighter.swift */; };
-		06B120911D811B8900D14B02 /* PieRadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120081D811B8900D14B02 /* PieRadarHighlighter.swift */; };
-		06B120921D811B8900D14B02 /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120091D811B8900D14B02 /* RadarHighlighter.swift */; };
-		06B120931D811B8900D14B02 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1200A1D811B8900D14B02 /* Range.swift */; };
-		06B120941D811B8900D14B02 /* BarChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1200C1D811B8900D14B02 /* BarChartDataProvider.swift */; };
-		06B120951D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1200D1D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataProvider.swift */; };
-		06B120961D811B8900D14B02 /* BubbleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1200E1D811B8900D14B02 /* BubbleChartDataProvider.swift */; };
-		06B120971D811B8900D14B02 /* CandleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1200F1D811B8900D14B02 /* CandleChartDataProvider.swift */; };
-		06B120981D811B8900D14B02 /* ChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120101D811B8900D14B02 /* ChartDataProvider.swift */; };
-		06B120991D811B8900D14B02 /* CombinedChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120111D811B8900D14B02 /* CombinedChartDataProvider.swift */; };
-		06B1209A1D811B8900D14B02 /* LineChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120121D811B8900D14B02 /* LineChartDataProvider.swift */; };
-		06B1209B1D811B8900D14B02 /* ScatterChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120131D811B8900D14B02 /* ScatterChartDataProvider.swift */; };
-		06B1209C1D811B8900D14B02 /* AnimatedMoveViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120151D811B8900D14B02 /* AnimatedMoveViewJob.swift */; };
-		06B1209D1D811B8900D14B02 /* AnimatedViewPortJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120161D811B8900D14B02 /* AnimatedViewPortJob.swift */; };
-		06B1209E1D811B8900D14B02 /* AnimatedZoomViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120171D811B8900D14B02 /* AnimatedZoomViewJob.swift */; };
-		06B1209F1D811B8900D14B02 /* MoveViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120181D811B8900D14B02 /* MoveViewJob.swift */; };
-		06B120A01D811B8900D14B02 /* ViewPortJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120191D811B8900D14B02 /* ViewPortJob.swift */; };
-		06B120A11D811B8900D14B02 /* ZoomViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1201A1D811B8900D14B02 /* ZoomViewJob.swift */; };
-		06B120A21D811B8900D14B02 /* AxisRendererBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1201C1D811B8900D14B02 /* AxisRendererBase.swift */; };
-		06B120A31D811B8900D14B02 /* BarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1201D1D811B8900D14B02 /* BarChartRenderer.swift */; };
-		06B120A41D811B8900D14B02 /* BarLineScatterCandleBubbleRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1201E1D811B8900D14B02 /* BarLineScatterCandleBubbleRenderer.swift */; };
-		06B120A51D811B8900D14B02 /* BubbleChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1201F1D811B8900D14B02 /* BubbleChartRenderer.swift */; };
-		06B120A61D811B8900D14B02 /* CandleStickChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120201D811B8900D14B02 /* CandleStickChartRenderer.swift */; };
-		06B120A71D811B8900D14B02 /* ChartDataRendererBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120211D811B8900D14B02 /* ChartDataRendererBase.swift */; };
-		06B120A81D811B8900D14B02 /* CombinedChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120221D811B8900D14B02 /* CombinedChartRenderer.swift */; };
-		06B120A91D811B8900D14B02 /* HorizontalBarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120231D811B8900D14B02 /* HorizontalBarChartRenderer.swift */; };
-		06B120AA1D811B8900D14B02 /* LegendRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120241D811B8900D14B02 /* LegendRenderer.swift */; };
-		06B120AB1D811B8900D14B02 /* LineChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120251D811B8900D14B02 /* LineChartRenderer.swift */; };
-		06B120AC1D811B8900D14B02 /* LineRadarRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120261D811B8900D14B02 /* LineRadarRenderer.swift */; };
-		06B120AD1D811B8900D14B02 /* LineScatterCandleRadarRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120271D811B8900D14B02 /* LineScatterCandleRadarRenderer.swift */; };
-		06B120AE1D811B8900D14B02 /* PieChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120281D811B8900D14B02 /* PieChartRenderer.swift */; };
-		06B120AF1D811B8900D14B02 /* RadarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120291D811B8900D14B02 /* RadarChartRenderer.swift */; };
-		06B120B01D811B8900D14B02 /* Renderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1202A1D811B8900D14B02 /* Renderer.swift */; };
-		06B120B11D811B8900D14B02 /* ChevronDownShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1202C1D811B8900D14B02 /* ChevronDownShapeRenderer.swift */; };
-		06B120B21D811B8900D14B02 /* ChevronUpShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1202D1D811B8900D14B02 /* ChevronUpShapeRenderer.swift */; };
-		06B120B31D811B8900D14B02 /* CircleShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1202E1D811B8900D14B02 /* CircleShapeRenderer.swift */; };
-		06B120B41D811B8900D14B02 /* CrossShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1202F1D811B8900D14B02 /* CrossShapeRenderer.swift */; };
-		06B120B51D811B8900D14B02 /* IShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120301D811B8900D14B02 /* IShapeRenderer.swift */; };
-		06B120B61D811B8900D14B02 /* SquareShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120311D811B8900D14B02 /* SquareShapeRenderer.swift */; };
-		06B120B71D811B8900D14B02 /* TriangleShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120321D811B8900D14B02 /* TriangleShapeRenderer.swift */; };
-		06B120B81D811B8900D14B02 /* XShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120331D811B8900D14B02 /* XShapeRenderer.swift */; };
-		06B120B91D811B8900D14B02 /* ScatterChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120341D811B8900D14B02 /* ScatterChartRenderer.swift */; };
-		06B120BA1D811B8900D14B02 /* XAxisRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120351D811B8900D14B02 /* XAxisRenderer.swift */; };
-		06B120BB1D811B8900D14B02 /* XAxisRendererHorizontalBarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120361D811B8900D14B02 /* XAxisRendererHorizontalBarChart.swift */; };
-		06B120BC1D811B8900D14B02 /* XAxisRendererRadarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120371D811B8900D14B02 /* XAxisRendererRadarChart.swift */; };
-		06B120BD1D811B8900D14B02 /* YAxisRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120381D811B8900D14B02 /* YAxisRenderer.swift */; };
-		06B120BE1D811B8900D14B02 /* YAxisRendererHorizontalBarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120391D811B8900D14B02 /* YAxisRendererHorizontalBarChart.swift */; };
-		06B120BF1D811B8900D14B02 /* YAxisRendererRadarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1203A1D811B8900D14B02 /* YAxisRendererRadarChart.swift */; };
-		06B120C01D811B8900D14B02 /* ChartColorTemplates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1203C1D811B8900D14B02 /* ChartColorTemplates.swift */; };
-		06B120C11D811B8900D14B02 /* ChartUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1203D1D811B8900D14B02 /* ChartUtils.swift */; };
-		06B120C21D811B8900D14B02 /* Fill.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1203E1D811B8900D14B02 /* Fill.swift */; };
-		06B120C31D811B8900D14B02 /* Platform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1203F1D811B8900D14B02 /* Platform.swift */; };
-		06B120C41D811B8900D14B02 /* Transformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120401D811B8900D14B02 /* Transformer.swift */; };
-		06B120C51D811B8900D14B02 /* TransformerHorizontalBarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120411D811B8900D14B02 /* TransformerHorizontalBarChart.swift */; };
-		06B120C61D811B8900D14B02 /* ViewPortHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B120421D811B8900D14B02 /* ViewPortHandler.swift */; };
-		06B3C0F71D99F85400B1DF43 /* BarChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B3C0F31D99F85400B1DF43 /* BarChartTests.swift */; };
-		06B3C0F81D99F85400B1DF43 /* LineChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B3C0F41D99F85400B1DF43 /* LineChartTests.swift */; };
-		5B56A9CD1D905EB300F58178 /* Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B56A9CC1D905EB300F58178 /* Description.swift */; };
-		5BF8813B1DDC4DF70033370C /* IndexAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF8813A1DDC4DF70033370C /* IndexAxisValueFormatter.swift */; };
-		D8A58A411DCE2EF8007BB012 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8A58A401DCE2EF8007BB012 /* Media.xcassets */; };
+		00B8BF5901C2D220357B0B2A /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 41DDB768A1D033A34F0EF9E0 /* Media.xcassets */; };
+		00BC23EF0E04E17188344403 /* BarChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7184C8A5A60A3522AB9B05 /* BarChartDataProvider.swift */; };
+		02A6E6E1A82A27A66B8D08C4 /* MoveViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 266E162DA8B29D9AEB6A9397 /* MoveViewJob.swift */; };
+		03960E8148C6AEDACE4B77CC /* IMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 596963A429D485E3894C4666 /* IMarker.swift */; };
+		0511E43EF3FD2CDE7F7F15DB /* ScatterChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FD37A55B4D85D883E29C744 /* ScatterChartDataProvider.swift */; };
+		05253AFC448C107DEF54C2FE /* CombinedChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52265C1B343CCC41AF2300E3 /* CombinedChartRenderer.swift */; };
+		0529DD51622C8769C1121F90 /* CrossShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 823F7DB281C6C6F069A69605 /* CrossShapeRenderer.swift */; };
+		0577C2B38BCE4C871F262714 /* AnimatedZoomViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2EA58CB336967198D30D20 /* AnimatedZoomViewJob.swift */; };
+		064989461F5C99C7006E8BB3 /* Snapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064989451F5C99C7006E8BB3 /* Snapshot.swift */; };
+		0A772AEC08246FEC480673E5 /* PieRadarChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A6C9631C69B2D772BBD9232 /* PieRadarChartViewBase.swift */; };
+		0C52C70C6E6EA09BD7426386 /* RadarChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB57D6FA41029B08F26D7B /* RadarChartData.swift */; };
+		0CAF514A280FF6A14E2A1A23 /* CombinedChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11EF1FE22549E885C8F40738 /* CombinedChartView.swift */; };
+		0D8A89398F9BD5DCC8D7F976 /* ICandleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18BFB0A14A5C47A302A597D9 /* ICandleChartDataSet.swift */; };
+		11F68AA2EBF822D7208EE002 /* YAxisRendererRadarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5A16F4A382813C4FE8BDF9 /* YAxisRendererRadarChart.swift */; };
+		1311BEC21E9CC264E971EFAF /* ILineRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F7E6A99D82E6AE3804D5A39 /* ILineRadarChartDataSet.swift */; };
+		135F11CE20425AF600D655A3 /* PieChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 135F11CD20425AF600D655A3 /* PieChartTests.swift */; };
+		146EE16342C2BADC92E45BF2 /* ILineScatterCandleRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9249AD9AEC8C85772365A128 /* ILineScatterCandleRadarChartDataSet.swift */; };
+		17E994DA88777AA1D8CCFC58 /* BarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C31AA65EA27776F8C653C7E8 /* BarChartDataSet.swift */; };
+		203A39685CC96FC625F616E4 /* IHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998F2BFE318471AFC05B50AC /* IHighlighter.swift */; };
+		219192CA6B4895319AB49DCA /* BarLineScatterCandleBubbleRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1C588E9DF6FFD56D7ADF8E /* BarLineScatterCandleBubbleRenderer.swift */; };
+		224EFF991FBAAC4700CF9B3B /* EquatableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 224EFF981FBAAC4700CF9B3B /* EquatableTests.swift */; };
+		23649EFC635A76022F07FFA6 /* PieChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD02157CF8CEE1189BF681DA /* PieChartDataEntry.swift */; };
+		23FA50B2730D8C7ACA091C4F /* BarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F279974FE650E57A061B09 /* BarChartRenderer.swift */; };
+		24151B0729D77251A8494D70 /* LineRadarRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 105FFC9D3773A9C7A60A897F /* LineRadarRenderer.swift */; };
+		2876E17AEB1D92D7BBC4C38A /* PieChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DCD13D558BA177D5952AD66 /* PieChartView.swift */; };
+		28FEE609C5B22FD64C7E5D10 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FF03960A871A092F5B54315 /* BarLineScatterCandleBubbleChartDataProvider.swift */; };
+		2A94F1724FEA9E16A81A8E1F /* XAxisRendererHorizontalBarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F3D55A7E6176D52DC957D27 /* XAxisRendererHorizontalBarChart.swift */; };
+		2B791E64E7C4523B1A63F72A /* ScatterChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7AD2FC320A16CA1EE0A52F4 /* ScatterChartData.swift */; };
+		2B821AAC3EBD60A73EACBCE6 /* LegendRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F715DB2C56C9E0615542625B /* LegendRenderer.swift */; };
+		2BA03CEC36BADCF682F1328B /* LineChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFABD027DAF6851088F002AC /* LineChartDataProvider.swift */; };
+		2BF85BEA981B359A65E9BF67 /* LineChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1819D72CD7B6C4A4E8048 /* LineChartTests.swift */; };
+		2C40CFFC8D88BEA70E0A50B0 /* IBubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3788EC55EF908B0805D7C2F /* IBubbleChartDataSet.swift */; };
+		2C879FC24D7A15D70BE4063F /* PieChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E03A4987F72414A02A0631B /* PieChartData.swift */; };
+		2FBA7E982EB57932B9F3E9B5 /* YAxis.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB92A80F861C1362EED8D946 /* YAxis.swift */; };
+		3097296AC7FFA994FE4AD312 /* PieRadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F7B9DF1F2D66E7279771D4 /* PieRadarHighlighter.swift */; };
+		30DCC4BAA5601B154ABADA13 /* CandleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F8146ABC9FC311AF8CA699C /* CandleChartDataProvider.swift */; };
+		331AA2C4BC34F56C23012F02 /* CombinedChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DDE409E9ECF54D2C146A6F0 /* CombinedChartData.swift */; };
+		3395682A1E27756651FF6F4D /* BarChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0108D5925E21A47DA36A66AA /* BarChartData.swift */; };
+		369DEB23452CB436A3A1A644 /* MarkerImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392AAEB02DD7B351D92907C2 /* MarkerImage.swift */; };
+		383D68A13E1C3D6A251E5147 /* CandleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 274116834B1B0345D622E027 /* CandleChartDataSet.swift */; };
+		3B11556EB7DC034E2FC958E4 /* BarChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F5E1A69EC06E86505F7B1 /* BarChartTests.swift */; };
+		3CBE95F1E9394FA08CDCF31E /* BarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 543729805D897CC03E5F78D3 /* BarHighlighter.swift */; };
+		40C82F2209E1BA9E41E8F3DA /* ChartColorTemplates.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6227A646166E248F90F86AD /* ChartColorTemplates.swift */; };
+		41B13F3179ACB5A3837C6E55 /* YAxisRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 688B80F1AA88AE54152BE768 /* YAxisRenderer.swift */; };
+		41BEBF8BDB9DC403B5697D67 /* XAxisRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C02C3AF5C92FCFC18224C35 /* XAxisRenderer.swift */; };
+		4272DA5D44AF7DA05A5A8287 /* BubbleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDEAF554FD0D68EA4C0E7E49 /* BubbleChartDataProvider.swift */; };
+		4390D74986A92DEF4F4F2BF0 /* ChartLimitLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6DEBFAB1D73E944ED430B4F /* ChartLimitLine.swift */; };
+		45C459FA25DFCBE62FA6A06C /* BarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3F8BFF1CBC58D5B9DBFFB9B /* BarChartDataEntry.swift */; };
+		48E875BBD6540BDE1C1B7D3D /* AxisBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B7AEFBF4D85B9D2EAAB3071 /* AxisBase.swift */; };
+		4E98788ABEF6496C23F3E6C6 /* HorizontalBarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33BE9A97FFA41D3D85CAFFC7 /* HorizontalBarHighlighter.swift */; };
+		4FACC6FD308AFB231EB4A93D /* XAxisRendererRadarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC19DC2434D65FFB446A61B7 /* XAxisRendererRadarChart.swift */; };
+		50476F8E6662CAFC1EFE0723 /* IScatterChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219BC9CEA037F897E92E45D1 /* IScatterChartDataSet.swift */; };
+		515E286E6C47594D3FFA3DD1 /* ViewPortHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72EAEBB7CF73E33565FC2896 /* ViewPortHandler.swift */; };
+		53A91F6F86740E26FE733639 /* BarLineScatterCandleBubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D717F0808DE7EC8A4AE9C2A /* BarLineScatterCandleBubbleChartDataSet.swift */; };
+		56E0F5EA9255B9B92876E040 /* BubbleChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2194AA554712E6BA2677F114 /* BubbleChartRenderer.swift */; };
+		5C457D9A50DA20869AD1739D /* ScatterChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18462BFDD9DEE76D51D40503 /* ScatterChartView.swift */; };
+		5DC9BC1B6C128B2C9995AB84 /* ScatterChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80D5B764EC0AE1E17E55DC67 /* ScatterChartRenderer.swift */; };
+		5F96E95C7073D21EFE02BCF7 /* LineChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DABDBBCCE6B3620C967F04A /* LineChartRenderer.swift */; };
+		60EDF735AAB7195DCFA5FE4D /* CandleStickChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA1A58428DC4780BAB4EAADC /* CandleStickChartView.swift */; };
+		6303DBDEE4FAB8E40D023BCE /* RadarChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2440DB759AB93B4A928A3F6F /* RadarChartView.swift */; };
+		63C0A21D145BFEDED5406E4D /* BubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44829AF0ADA583F1F0279B7 /* BubbleChartDataSet.swift */; };
+		64FA1EDB4DC1F65727D52D10 /* CombinedHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2465CB73738EBAFB46C57288 /* CombinedHighlighter.swift */; };
+		65EA404AE098EBCE8D5DE04B /* CombinedChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A140F644332704916947B58C /* CombinedChartDataProvider.swift */; };
+		66A18A8EEBAAAC2EDA31ABEC /* ChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CEC0C69C89CE9B99F3B4409 /* ChartDataSet.swift */; };
+		69EA073EDF75D49ABE1715D6 /* RadarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC9C3D69ACB5BDE22421E15 /* RadarChartRenderer.swift */; };
+		73EDF662AD989E930D365B72 /* PieHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7036F11832C017E26AC750A4 /* PieHighlighter.swift */; };
+		758EB1C75063ED3373542F3B /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D64616883374310C505EC39 /* Highlight.swift */; };
+		779B46E9F13A087BFA47D539 /* DefaultAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A4770E0F75EFFC30707A7C8 /* DefaultAxisValueFormatter.swift */; };
+		78084A4F1D850D5775BC139E /* XAxis.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5225ABC3C0C2F65FC094EEBB /* XAxis.swift */; };
+		795E100895C24049509F1EDE /* PieChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46D8013D44629521B1746364 /* PieChartRenderer.swift */; };
+		796D3E63A37A95FD9D1AB9A1 /* ChevronDownShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52E8344160B5E689DA3C25C /* ChevronDownShapeRenderer.swift */; };
+		7C9CE6718D18859A35146098 /* BarLineScatterCandleBubbleChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559DB735FEA17AB90676D6CA /* BarLineScatterCandleBubbleChartData.swift */; };
+		7CB7F74752619B0270CCB0A9 /* LineRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45E31A4356CC6F283C29954B /* LineRadarChartDataSet.swift */; };
+		7D546013F3A14FF5BB7F3294 /* ChartDataEntryBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12409C3EA15787C11AF0D2BC /* ChartDataEntryBase.swift */; };
+		7E7561DE19DC7CABBE0B2D3A /* LineChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0619A877C69A95ECCC440A44 /* LineChartView.swift */; };
+		7EE6EFE70CF4D8B09CAFCD01 /* AnimatedMoveViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA157EFF2F952192C11DF937 /* AnimatedMoveViewJob.swift */; };
+		8102A555DD6C93AC1290EA7C /* Fill.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A4CFFFB65819121595F06F1 /* Fill.swift */; };
+		81892994002C0640AD858748 /* ChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = E120E76C6F1B5877D56126DD /* ChartData.swift */; };
+		83BBAF3EDC31FD452F8BF1DB /* IRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EAD807534620E3B53327F04 /* IRadarChartDataSet.swift */; };
+		846AC09831FA93F66732591B /* YAxisRendererHorizontalBarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE417AAA0FCA0DD00E77489 /* YAxisRendererHorizontalBarChart.swift */; };
+		8A463E2947F211C594CA5E95 /* TransformerHorizontalBarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 324C9127B53A8D39C8B49277 /* TransformerHorizontalBarChart.swift */; };
+		8A9FF54E2075A9047CC8E953 /* IShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA1D3D13180C2E3893A82546 /* IShapeRenderer.swift */; };
+		8BCCD709AACC565613D9DA68 /* CandleStickChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD5C6D20243EC2F19069AACD /* CandleStickChartRenderer.swift */; };
+		8E1192F7A7152E9DA92C56A9 /* ChartUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AB9062A28AAB9469752A954 /* ChartUtilsTests.swift */; };
+		8EF7B3FBE37F72CC030CD865 /* SquareShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32FC01A016DFF1BA73AF9182 /* SquareShapeRenderer.swift */; };
+		8F4B1A9060472764073DFA0B /* TriangleShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8FB6219B143F8F7DA762950 /* TriangleShapeRenderer.swift */; };
+		9360348A04723E653FBC8B18 /* MarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48164CCD83C51B496533CB77 /* MarkerView.swift */; };
+		93A94E1FF55041A6032891FE /* XShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23D35CF6F9177D77B6B97AE1 /* XShapeRenderer.swift */; };
+		9400725714D0DA707DDECD2E /* ViewPortJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA7BDB22C97F39A4B33E38A7 /* ViewPortJob.swift */; };
+		95B6D6F35684292A62DBEA74 /* LineChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A75AA73C5AA381DA517959 /* LineChartDataSet.swift */; };
+		967EE2EDDE3337C5C4337C59 /* IndexAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10DD0A02E3CF611BD11EBA9B /* IndexAxisValueFormatter.swift */; };
+		97AD2D4620AF917100F9C24A /* Platform+Accessibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD2D4520AF917100F9C24A /* Platform+Accessibility.swift */; };
+		97E033CC0ABEF0F448DAFA8E /* DataApproximator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93EF9709CF635BEE70D1ABC5 /* DataApproximator.swift */; };
+		98E2EEF45E8933E4AD182D58 /* ChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30EFAD7920F76360ADB3B5F5 /* ChartViewBase.swift */; };
+		9A26C8DB1F87B01700367599 /* DataApproximator+N.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A26C8DA1F87B01700367599 /* DataApproximator+N.swift */; };
+		9C91C151608E2D6E19B1EAD1 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F099502DA50C56204E7B744 /* Range.swift */; };
+		9F760570BCECB0BF5727AF90 /* BarLineChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C6D3723C4E001B119CA0C8 /* BarLineChartViewBase.swift */; };
+		A40ACF0CCE96EEE104B0463D /* IValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EAA8AA30C377D54D22A577A /* IValueFormatter.swift */; };
+		A692D8BDE42717F69DB790BE /* HorizontalBarChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6021C9E424C36116AEA78CC9 /* HorizontalBarChartView.swift */; };
+		AEE9C4E4AC02B8FB3CD21975 /* ZoomViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB3A4F5987E58F3E5BE855F9 /* ZoomViewJob.swift */; };
+		AF4AAF3709ED9DDF6362EAE8 /* IBarLineScatterCandleBubbleChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5649B272BF3EBFC8A1EF0C1 /* IBarLineScatterCandleBubbleChartDataSet.swift */; };
+		B0D28C68BB9A958DC56EB214 /* DefaultValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 107D8F8163EE54D6D9E916B0 /* DefaultValueFormatter.swift */; };
+		B13C74B4FF705D7B595D01EF /* IAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BD9DF16AF59680A3BB49452 /* IAxisValueFormatter.swift */; };
+		B539114951455C35BADAE3F3 /* PieChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4FB5E3761EF8B4D1E1E1014 /* PieChartDataSet.swift */; };
+		B66817462241E3CC00017CF1 /* HorizontalBarChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */; };
+		B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */; };
+		B6C9F450D937B87224D29D5C /* IFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 818AC6B12505B7C0A53D62F9 /* IFillFormatter.swift */; };
+		B6DCC229615EFE706F64A37D /* LineScatterCandleRadarRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 923206233CA89FD03565FF87 /* LineScatterCandleRadarRenderer.swift */; };
+		B85DEB06B4C1AFFC8A0E3295 /* CircleShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECE1B1623D3AF69CECAE8562 /* CircleShapeRenderer.swift */; };
+		BEFD9518F3A74ACF8FA33308 /* Charts.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F9922F0641F7955DC6CD324 /* Charts.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C03E6D8123DAAB2600083010 /* ChartDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03E6D8023DAAB2600083010 /* ChartDataTests.swift */; };
+		C04D269AD4A373FD2B621C43 /* LineChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C978F31F23C7D21197DC2A1 /* LineChartData.swift */; };
+		C09E91F67A4AC43C277E7D82 /* BubbleChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD8ED233775EEC31243A6919 /* BubbleChartDataEntry.swift */; };
+		C20A62D8CB9120523D5FB650 /* LegendEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E7C673B9ED4340F550A9283 /* LegendEntry.swift */; };
+		C2EFB4EC8C97FA9987F1B50D /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91EEEDE2AB8F2DA3AFCF0733 /* RadarChartDataEntry.swift */; };
+		C33E1AF5471A60BA42DAF52E /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F368CF209744D8F3B85B1028 /* RadarHighlighter.swift */; };
+		C3F0DDB7F0A922F0BB7EDB8A /* IBarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A53A9E42FC07FFDACA937C1 /* IBarChartDataSet.swift */; };
+		C7B150D740255670DEB9F455 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AD9E95D9ED4DC0BD73A743 /* Charts.framework */; };
+		C9AA360A2355F01F00C97D93 /* Platform+Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9AA36092355F01F00C97D93 /* Platform+Color.swift */; };
+		C9F3DC262355F791000C3215 /* Platform+Graphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F3DC242355F791000C3215 /* Platform+Graphics.swift */; };
+		C9F3DC272355F791000C3215 /* Platform+Gestures.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F3DC252355F791000C3215 /* Platform+Gestures.swift */; };
+		C9F3DC292355FA2F000C3215 /* Platform+Touch Handling.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F3DC282355FA2F000C3215 /* Platform+Touch Handling.swift */; };
+		CB785FE9B6B312408D17BC3B /* ChartUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FDA09EF973925A110506799 /* ChartUtils.swift */; };
+		CC7F8198A13249B5DEBBF25E /* AnimatedViewPortJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 710D7C9B2F1DB4A331EE405A /* AnimatedViewPortJob.swift */; };
+		CEF68F42A5390A73113F3663 /* Renderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F66B32AD8A878CBD6DB6ED2 /* Renderer.swift */; };
+		D29BBEF55C9CC90114919CD2 /* BarChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E783CFB4889A767C76510917 /* BarChartView.swift */; };
+		D326491E8BCDE54A0921E137 /* ChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5983826927D825EF5F855C28 /* ChartHighlighter.swift */; };
+		D50B0EC2BB2245F32E757C50 /* CandleChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E698FF540029B70AC97AD7 /* CandleChartDataEntry.swift */; };
+		D819331DA581C7E0AC5F8CEF /* Animator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3976E5F9D60E30CD94CE6156 /* Animator.swift */; };
+		DBC9DB402CC9BB84B76968C4 /* Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = B137428B41C143D5115726C4 /* Description.swift */; };
+		DDE704689FDF2C0E0338488B /* CandleChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4785FEACAE4367F36FB8868 /* CandleChartData.swift */; };
+		DE0F434FE8C24C52B023370F /* Transformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF475B9593B9898853814340 /* Transformer.swift */; };
+		E3B28EA1E21279DF3889BCE8 /* RadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1BA6B21CBDF77A15848994F /* RadarChartDataSet.swift */; };
+		E4B2F363414E84C4D4B8A885 /* BubbleChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EED352A98860E031F13AFB7 /* BubbleChartView.swift */; };
+		E50D291A6B6E69BF0B56A67C /* ChartBaseDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9FE42E868A225C116537368 /* ChartBaseDataSet.swift */; };
+		E68CA3DC66EB638C956E09B8 /* BubbleChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EDA3AD550AEFC93C8D15B9C /* BubbleChartData.swift */; };
+		E8F0F4F47CD7D72B4EE5A794 /* IChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A32510073A303CBB38E094A /* IChartDataSet.swift */; };
+		E9FF0ECB5E0CA92DBF4C1BC4 /* Platform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED23C354AFE81818D78E645 /* Platform.swift */; };
+		EAEA60D22CA8C1B7E18D3F7D /* ChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = F22750328058DEC2F019646F /* ChartDataEntry.swift */; };
+		EB56849433A76B08606B73EB /* ScatterChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB1DD1A0F64266A10EE94194 /* ScatterChartDataSet.swift */; };
+		ECE7EAE7179A7F57CE9BBD8F /* Legend.swift in Sources */ = {isa = PBXBuildFile; fileRef = E64A75540C627E09080B402A /* Legend.swift */; };
+		ECECC58CEF03B1718F8267E8 /* AxisRendererBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C75935E899183DDFA181E2CC /* AxisRendererBase.swift */; };
+		F100D68395F169B93590FA96 /* HorizontalBarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 539382766378B702660FDFB2 /* HorizontalBarChartRenderer.swift */; };
+		F103D90FC5DEEA0D7BB4407E /* ChevronUpShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA70259ED16FF80D8EEB0F94 /* ChevronUpShapeRenderer.swift */; };
+		F37B07008B8AE7F3909FFB9C /* ChartDataRendererBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0216EDC6A1FE272F4EB19FCF /* ChartDataRendererBase.swift */; };
+		F5A209116FAC68F5903D0B46 /* ChartAnimationEasing.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFB762958EE8E6521563665D /* ChartAnimationEasing.swift */; };
+		F744C510DA9B85C228BBB335 /* DefaultFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C1BEFDF17404666C7B6054 /* DefaultFillFormatter.swift */; };
+		F941C88BF814DF51C465CB95 /* ILineChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 429E88F2729735DC092EE556 /* ILineChartDataSet.swift */; };
+		FA07D034D9C3BC7795184ACA /* LineScatterCandleRadarChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C58BD7B14BEA440783ED8D2B /* LineScatterCandleRadarChartDataSet.swift */; };
+		FAAD9FF6565DED2652188584 /* IPieChartDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2AA6CC89F809DCCD7605B4 /* IPieChartDataSet.swift */; };
+		FD37AAC0270F390FFC470A65 /* ChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62B73FCEDD3841E7B958F6A9 /* ChartDataProvider.swift */; };
+		FDBDAFA7A5337C6E3992DACE /* ComponentBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C9A105A7DB64F39DDA648B /* ComponentBase.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		06165F301D8110E600722320 /* PBXContainerItemProxy */ = {
+		C2005F425A98942473657ED2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 06165F1B1D8110E600722320 /* Project object */;
+			containerPortal = 193FC8DF32D250560C5F5D77 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 06165F231D8110E600722320;
+			remoteGlobalIDString = A58A4ED274A941CA248EA921;
 			remoteInfo = Charts;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		06165F241D8110E600722320 /* Charts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Charts.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		06165F2E1D8110E600722320 /* ChartsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChartsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		063FF0401D8CC9940094A042 /* Carthage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Carthage.xcconfig; sourceTree = "<group>"; };
-		06761B5D1D98176000D5CE09 /* ChartUtilsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChartUtilsTests.swift; path = Tests/Charts/ChartUtilsTests.swift; sourceTree = SOURCE_ROOT; };
-		06B11FAC1D811B6600D14B02 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Source/Supporting Files/Info.plist"; sourceTree = "<group>"; };
-		06B11FAE1D811B7000D14B02 /* Charts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Charts.h; path = "Source/Supporting Files/Charts.h"; sourceTree = "<group>"; };
-		06B11FB11D811B8900D14B02 /* Animator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Animator.swift; sourceTree = "<group>"; };
-		06B11FB21D811B8900D14B02 /* ChartAnimationEasing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartAnimationEasing.swift; sourceTree = "<group>"; };
-		06B11FB41D811B8900D14B02 /* BarChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartView.swift; sourceTree = "<group>"; };
-		06B11FB51D811B8900D14B02 /* BarLineChartViewBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarLineChartViewBase.swift; sourceTree = "<group>"; };
-		06B11FB61D811B8900D14B02 /* BubbleChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartView.swift; sourceTree = "<group>"; };
-		06B11FB71D811B8900D14B02 /* CandleStickChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CandleStickChartView.swift; sourceTree = "<group>"; };
-		06B11FB81D811B8900D14B02 /* ChartViewBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartViewBase.swift; sourceTree = "<group>"; };
-		06B11FB91D811B8900D14B02 /* CombinedChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombinedChartView.swift; sourceTree = "<group>"; };
-		06B11FBA1D811B8900D14B02 /* HorizontalBarChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalBarChartView.swift; sourceTree = "<group>"; };
-		06B11FBB1D811B8900D14B02 /* LineChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartView.swift; sourceTree = "<group>"; };
-		06B11FBC1D811B8900D14B02 /* PieChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartView.swift; sourceTree = "<group>"; };
-		06B11FBD1D811B8900D14B02 /* PieRadarChartViewBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieRadarChartViewBase.swift; sourceTree = "<group>"; };
-		06B11FBE1D811B8900D14B02 /* RadarChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarChartView.swift; sourceTree = "<group>"; };
-		06B11FBF1D811B8900D14B02 /* ScatterChartView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScatterChartView.swift; sourceTree = "<group>"; };
-		06B11FC11D811B8900D14B02 /* AxisBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AxisBase.swift; sourceTree = "<group>"; };
-		06B11FC21D811B8900D14B02 /* ChartLimitLine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartLimitLine.swift; sourceTree = "<group>"; };
-		06B11FC31D811B8900D14B02 /* ComponentBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComponentBase.swift; sourceTree = "<group>"; };
-		06B11FC41D811B8900D14B02 /* IMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMarker.swift; sourceTree = "<group>"; };
-		06B11FC51D811B8900D14B02 /* Legend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Legend.swift; sourceTree = "<group>"; };
-		06B11FC61D811B8900D14B02 /* LegendEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegendEntry.swift; sourceTree = "<group>"; };
-		06B11FC71D811B8900D14B02 /* MarkerImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkerImage.swift; sourceTree = "<group>"; };
-		06B11FC81D811B8900D14B02 /* MarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkerView.swift; sourceTree = "<group>"; };
-		06B11FC91D811B8900D14B02 /* XAxis.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XAxis.swift; sourceTree = "<group>"; };
-		06B11FCA1D811B8900D14B02 /* YAxis.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YAxis.swift; sourceTree = "<group>"; };
-		06B11FCD1D811B8900D14B02 /* ChartBaseDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartBaseDataSet.swift; sourceTree = "<group>"; };
-		06B11FCF1D811B8900D14B02 /* BarChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartData.swift; sourceTree = "<group>"; };
-		06B11FD01D811B8900D14B02 /* BarChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartDataEntry.swift; sourceTree = "<group>"; };
-		06B11FD11D811B8900D14B02 /* BarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FD21D811B8900D14B02 /* BarLineScatterCandleBubbleChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarLineScatterCandleBubbleChartData.swift; sourceTree = "<group>"; };
-		06B11FD31D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarLineScatterCandleBubbleChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FD41D811B8900D14B02 /* BubbleChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartData.swift; sourceTree = "<group>"; };
-		06B11FD51D811B8900D14B02 /* BubbleChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartDataEntry.swift; sourceTree = "<group>"; };
-		06B11FD61D811B8900D14B02 /* BubbleChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FD71D811B8900D14B02 /* CandleChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CandleChartData.swift; sourceTree = "<group>"; };
-		06B11FD81D811B8900D14B02 /* CandleChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CandleChartDataEntry.swift; sourceTree = "<group>"; };
-		06B11FD91D811B8900D14B02 /* CandleChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CandleChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FDA1D811B8900D14B02 /* ChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartData.swift; sourceTree = "<group>"; };
-		06B11FDB1D811B8900D14B02 /* ChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartDataEntry.swift; sourceTree = "<group>"; };
-		06B11FDC1D811B8900D14B02 /* ChartDataEntryBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartDataEntryBase.swift; sourceTree = "<group>"; };
-		06B11FDD1D811B8900D14B02 /* ChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FDE1D811B8900D14B02 /* CombinedChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombinedChartData.swift; sourceTree = "<group>"; };
-		06B11FDF1D811B8900D14B02 /* LineChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartData.swift; sourceTree = "<group>"; };
-		06B11FE01D811B8900D14B02 /* LineChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FE11D811B8900D14B02 /* LineRadarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineRadarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FE21D811B8900D14B02 /* LineScatterCandleRadarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineScatterCandleRadarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FE31D811B8900D14B02 /* PieChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartData.swift; sourceTree = "<group>"; };
-		06B11FE41D811B8900D14B02 /* PieChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartDataEntry.swift; sourceTree = "<group>"; };
-		06B11FE51D811B8900D14B02 /* PieChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FE61D811B8900D14B02 /* RadarChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarChartData.swift; sourceTree = "<group>"; };
-		06B11FE71D811B8900D14B02 /* RadarChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarChartDataEntry.swift; sourceTree = "<group>"; };
-		06B11FE81D811B8900D14B02 /* RadarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FE91D811B8900D14B02 /* ScatterChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScatterChartData.swift; sourceTree = "<group>"; };
-		06B11FEA1D811B8900D14B02 /* ScatterChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScatterChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FEC1D811B8900D14B02 /* IBarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IBarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FED1D811B8900D14B02 /* IBarLineScatterCandleBubbleChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IBarLineScatterCandleBubbleChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FEE1D811B8900D14B02 /* IBubbleChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IBubbleChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FEF1D811B8900D14B02 /* ICandleChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICandleChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF01D811B8900D14B02 /* IChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF11D811B8900D14B02 /* ILineChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ILineChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF21D811B8900D14B02 /* ILineRadarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ILineRadarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF31D811B8900D14B02 /* ILineScatterCandleRadarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ILineScatterCandleRadarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF41D811B8900D14B02 /* IPieChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IPieChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF51D811B8900D14B02 /* IRadarChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IRadarChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF61D811B8900D14B02 /* IScatterChartDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IScatterChartDataSet.swift; sourceTree = "<group>"; };
-		06B11FF81D811B8900D14B02 /* DataApproximator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataApproximator.swift; sourceTree = "<group>"; };
-		06B11FFA1D811B8900D14B02 /* DefaultAxisValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultAxisValueFormatter.swift; sourceTree = "<group>"; };
-		06B11FFB1D811B8900D14B02 /* DefaultFillFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultFillFormatter.swift; sourceTree = "<group>"; };
-		06B11FFC1D811B8900D14B02 /* DefaultValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultValueFormatter.swift; sourceTree = "<group>"; };
-		06B11FFD1D811B8900D14B02 /* IAxisValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IAxisValueFormatter.swift; sourceTree = "<group>"; };
-		06B11FFE1D811B8900D14B02 /* IFillFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IFillFormatter.swift; sourceTree = "<group>"; };
-		06B11FFF1D811B8900D14B02 /* IValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IValueFormatter.swift; sourceTree = "<group>"; };
-		06B120011D811B8900D14B02 /* BarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarHighlighter.swift; sourceTree = "<group>"; };
-		06B120021D811B8900D14B02 /* ChartHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartHighlighter.swift; sourceTree = "<group>"; };
-		06B120031D811B8900D14B02 /* CombinedHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombinedHighlighter.swift; sourceTree = "<group>"; };
-		06B120041D811B8900D14B02 /* Highlight.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Highlight.swift; sourceTree = "<group>"; };
-		06B120051D811B8900D14B02 /* HorizontalBarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalBarHighlighter.swift; sourceTree = "<group>"; };
-		06B120061D811B8900D14B02 /* IHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IHighlighter.swift; sourceTree = "<group>"; };
-		06B120071D811B8900D14B02 /* PieHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieHighlighter.swift; sourceTree = "<group>"; };
-		06B120081D811B8900D14B02 /* PieRadarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieRadarHighlighter.swift; sourceTree = "<group>"; };
-		06B120091D811B8900D14B02 /* RadarHighlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarHighlighter.swift; sourceTree = "<group>"; };
-		06B1200A1D811B8900D14B02 /* Range.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Range.swift; sourceTree = "<group>"; };
-		06B1200C1D811B8900D14B02 /* BarChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartDataProvider.swift; sourceTree = "<group>"; };
-		06B1200D1D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarLineScatterCandleBubbleChartDataProvider.swift; sourceTree = "<group>"; };
-		06B1200E1D811B8900D14B02 /* BubbleChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartDataProvider.swift; sourceTree = "<group>"; };
-		06B1200F1D811B8900D14B02 /* CandleChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CandleChartDataProvider.swift; sourceTree = "<group>"; };
-		06B120101D811B8900D14B02 /* ChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartDataProvider.swift; sourceTree = "<group>"; };
-		06B120111D811B8900D14B02 /* CombinedChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombinedChartDataProvider.swift; sourceTree = "<group>"; };
-		06B120121D811B8900D14B02 /* LineChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartDataProvider.swift; sourceTree = "<group>"; };
-		06B120131D811B8900D14B02 /* ScatterChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScatterChartDataProvider.swift; sourceTree = "<group>"; };
-		06B120151D811B8900D14B02 /* AnimatedMoveViewJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimatedMoveViewJob.swift; sourceTree = "<group>"; };
-		06B120161D811B8900D14B02 /* AnimatedViewPortJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimatedViewPortJob.swift; sourceTree = "<group>"; };
-		06B120171D811B8900D14B02 /* AnimatedZoomViewJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimatedZoomViewJob.swift; sourceTree = "<group>"; };
-		06B120181D811B8900D14B02 /* MoveViewJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoveViewJob.swift; sourceTree = "<group>"; };
-		06B120191D811B8900D14B02 /* ViewPortJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewPortJob.swift; sourceTree = "<group>"; };
-		06B1201A1D811B8900D14B02 /* ZoomViewJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZoomViewJob.swift; sourceTree = "<group>"; };
-		06B1201C1D811B8900D14B02 /* AxisRendererBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AxisRendererBase.swift; sourceTree = "<group>"; };
-		06B1201D1D811B8900D14B02 /* BarChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartRenderer.swift; sourceTree = "<group>"; };
-		06B1201E1D811B8900D14B02 /* BarLineScatterCandleBubbleRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarLineScatterCandleBubbleRenderer.swift; sourceTree = "<group>"; };
-		06B1201F1D811B8900D14B02 /* BubbleChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleChartRenderer.swift; sourceTree = "<group>"; };
-		06B120201D811B8900D14B02 /* CandleStickChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CandleStickChartRenderer.swift; sourceTree = "<group>"; };
-		06B120211D811B8900D14B02 /* ChartDataRendererBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartDataRendererBase.swift; sourceTree = "<group>"; };
-		06B120221D811B8900D14B02 /* CombinedChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombinedChartRenderer.swift; sourceTree = "<group>"; };
-		06B120231D811B8900D14B02 /* HorizontalBarChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalBarChartRenderer.swift; sourceTree = "<group>"; };
-		06B120241D811B8900D14B02 /* LegendRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegendRenderer.swift; sourceTree = "<group>"; };
-		06B120251D811B8900D14B02 /* LineChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartRenderer.swift; sourceTree = "<group>"; };
-		06B120261D811B8900D14B02 /* LineRadarRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineRadarRenderer.swift; sourceTree = "<group>"; };
-		06B120271D811B8900D14B02 /* LineScatterCandleRadarRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineScatterCandleRadarRenderer.swift; sourceTree = "<group>"; };
-		06B120281D811B8900D14B02 /* PieChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartRenderer.swift; sourceTree = "<group>"; };
-		06B120291D811B8900D14B02 /* RadarChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarChartRenderer.swift; sourceTree = "<group>"; };
-		06B1202A1D811B8900D14B02 /* Renderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Renderer.swift; sourceTree = "<group>"; };
-		06B1202C1D811B8900D14B02 /* ChevronDownShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChevronDownShapeRenderer.swift; sourceTree = "<group>"; };
-		06B1202D1D811B8900D14B02 /* ChevronUpShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChevronUpShapeRenderer.swift; sourceTree = "<group>"; };
-		06B1202E1D811B8900D14B02 /* CircleShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CircleShapeRenderer.swift; sourceTree = "<group>"; };
-		06B1202F1D811B8900D14B02 /* CrossShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrossShapeRenderer.swift; sourceTree = "<group>"; };
-		06B120301D811B8900D14B02 /* IShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IShapeRenderer.swift; sourceTree = "<group>"; };
-		06B120311D811B8900D14B02 /* SquareShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SquareShapeRenderer.swift; sourceTree = "<group>"; };
-		06B120321D811B8900D14B02 /* TriangleShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TriangleShapeRenderer.swift; sourceTree = "<group>"; };
-		06B120331D811B8900D14B02 /* XShapeRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XShapeRenderer.swift; sourceTree = "<group>"; };
-		06B120341D811B8900D14B02 /* ScatterChartRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScatterChartRenderer.swift; sourceTree = "<group>"; };
-		06B120351D811B8900D14B02 /* XAxisRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XAxisRenderer.swift; sourceTree = "<group>"; };
-		06B120361D811B8900D14B02 /* XAxisRendererHorizontalBarChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XAxisRendererHorizontalBarChart.swift; sourceTree = "<group>"; };
-		06B120371D811B8900D14B02 /* XAxisRendererRadarChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XAxisRendererRadarChart.swift; sourceTree = "<group>"; };
-		06B120381D811B8900D14B02 /* YAxisRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YAxisRenderer.swift; sourceTree = "<group>"; };
-		06B120391D811B8900D14B02 /* YAxisRendererHorizontalBarChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YAxisRendererHorizontalBarChart.swift; sourceTree = "<group>"; };
-		06B1203A1D811B8900D14B02 /* YAxisRendererRadarChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YAxisRendererRadarChart.swift; sourceTree = "<group>"; };
-		06B1203C1D811B8900D14B02 /* ChartColorTemplates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartColorTemplates.swift; sourceTree = "<group>"; };
-		06B1203D1D811B8900D14B02 /* ChartUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartUtils.swift; sourceTree = "<group>"; };
-		06B1203E1D811B8900D14B02 /* Fill.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fill.swift; sourceTree = "<group>"; };
-		06B1203F1D811B8900D14B02 /* Platform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Platform.swift; sourceTree = "<group>"; };
-		06B120401D811B8900D14B02 /* Transformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Transformer.swift; sourceTree = "<group>"; };
-		06B120411D811B8900D14B02 /* TransformerHorizontalBarChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransformerHorizontalBarChart.swift; sourceTree = "<group>"; };
-		06B120421D811B8900D14B02 /* ViewPortHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewPortHandler.swift; sourceTree = "<group>"; };
-		06B121111D81201C00D14B02 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Tests/Supporting Files/Info.plist"; sourceTree = SOURCE_ROOT; };
-		06B3C0F31D99F85400B1DF43 /* BarChartTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartTests.swift; sourceTree = "<group>"; };
-		06B3C0F41D99F85400B1DF43 /* LineChartTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartTests.swift; sourceTree = "<group>"; };
-		5B56A9CC1D905EB300F58178 /* Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Description.swift; sourceTree = "<group>"; };
-		5BF8813A1DDC4DF70033370C /* IndexAxisValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndexAxisValueFormatter.swift; sourceTree = "<group>"; };
-		D8A58A401DCE2EF8007BB012 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Media.xcassets; path = Charts/ChartsTests/Media.xcassets; sourceTree = SOURCE_ROOT; };
+		0108D5925E21A47DA36A66AA /* BarChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartData.swift; path = Source/Charts/Data/Implementations/Standard/BarChartData.swift; sourceTree = "<group>"; };
+		0216EDC6A1FE272F4EB19FCF /* ChartDataRendererBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataRendererBase.swift; path = Source/Charts/Renderers/ChartDataRendererBase.swift; sourceTree = "<group>"; };
+		04F7B9DF1F2D66E7279771D4 /* PieRadarHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieRadarHighlighter.swift; path = Source/Charts/Highlight/PieRadarHighlighter.swift; sourceTree = "<group>"; };
+		0619A877C69A95ECCC440A44 /* LineChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartView.swift; path = Source/Charts/Charts/LineChartView.swift; sourceTree = "<group>"; };
+		064989451F5C99C7006E8BB3 /* Snapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Snapshot.swift; path = Tests/Charts/Snapshot.swift; sourceTree = "<group>"; };
+		0BD9DF16AF59680A3BB49452 /* IAxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IAxisValueFormatter.swift; path = Source/Charts/Formatters/IAxisValueFormatter.swift; sourceTree = "<group>"; };
+		0DABDBBCCE6B3620C967F04A /* LineChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartRenderer.swift; path = Source/Charts/Renderers/LineChartRenderer.swift; sourceTree = "<group>"; };
+		0DDE409E9ECF54D2C146A6F0 /* CombinedChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedChartData.swift; path = Source/Charts/Data/Implementations/Standard/CombinedChartData.swift; sourceTree = "<group>"; };
+		0F099502DA50C56204E7B744 /* Range.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Range.swift; path = Source/Charts/Highlight/Range.swift; sourceTree = "<group>"; };
+		105FFC9D3773A9C7A60A897F /* LineRadarRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineRadarRenderer.swift; path = Source/Charts/Renderers/LineRadarRenderer.swift; sourceTree = "<group>"; };
+		107D8F8163EE54D6D9E916B0 /* DefaultValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultValueFormatter.swift; path = Source/Charts/Formatters/DefaultValueFormatter.swift; sourceTree = "<group>"; };
+		10DD0A02E3CF611BD11EBA9B /* IndexAxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IndexAxisValueFormatter.swift; path = Source/Charts/Formatters/IndexAxisValueFormatter.swift; sourceTree = "<group>"; };
+		11EF1FE22549E885C8F40738 /* CombinedChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedChartView.swift; path = Source/Charts/Charts/CombinedChartView.swift; sourceTree = "<group>"; };
+		12409C3EA15787C11AF0D2BC /* ChartDataEntryBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataEntryBase.swift; path = Source/Charts/Data/Implementations/Standard/ChartDataEntryBase.swift; sourceTree = "<group>"; };
+		135F11CD20425AF600D655A3 /* PieChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PieChartTests.swift; path = Tests/Charts/PieChartTests.swift; sourceTree = "<group>"; };
+		18462BFDD9DEE76D51D40503 /* ScatterChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartView.swift; path = Source/Charts/Charts/ScatterChartView.swift; sourceTree = "<group>"; };
+		18BFB0A14A5C47A302A597D9 /* ICandleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ICandleChartDataSet.swift; path = Source/Charts/Data/Interfaces/ICandleChartDataSet.swift; sourceTree = "<group>"; };
+		1C02C3AF5C92FCFC18224C35 /* XAxisRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxisRenderer.swift; path = Source/Charts/Renderers/XAxisRenderer.swift; sourceTree = "<group>"; };
+		1CBBC58C6CE1EBEE9852CE41 /* ChartsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChartsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		1F3D55A7E6176D52DC957D27 /* XAxisRendererHorizontalBarChart.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxisRendererHorizontalBarChart.swift; path = Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift; sourceTree = "<group>"; };
+		2194AA554712E6BA2677F114 /* BubbleChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartRenderer.swift; path = Source/Charts/Renderers/BubbleChartRenderer.swift; sourceTree = "<group>"; };
+		219BC9CEA037F897E92E45D1 /* IScatterChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IScatterChartDataSet.swift; path = Source/Charts/Data/Interfaces/IScatterChartDataSet.swift; sourceTree = "<group>"; };
+		224EFF981FBAAC4700CF9B3B /* EquatableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = EquatableTests.swift; path = Tests/Charts/EquatableTests.swift; sourceTree = "<group>"; };
+		23D35CF6F9177D77B6B97AE1 /* XShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/XShapeRenderer.swift; sourceTree = "<group>"; };
+		2440DB759AB93B4A928A3F6F /* RadarChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarChartView.swift; path = Source/Charts/Charts/RadarChartView.swift; sourceTree = "<group>"; };
+		2465CB73738EBAFB46C57288 /* CombinedHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedHighlighter.swift; path = Source/Charts/Highlight/CombinedHighlighter.swift; sourceTree = "<group>"; };
+		266E162DA8B29D9AEB6A9397 /* MoveViewJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MoveViewJob.swift; path = Source/Charts/Jobs/MoveViewJob.swift; sourceTree = "<group>"; };
+		274116834B1B0345D622E027 /* CandleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift; sourceTree = "<group>"; };
+		2EAD807534620E3B53327F04 /* IRadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IRadarChartDataSet.swift; path = Source/Charts/Data/Interfaces/IRadarChartDataSet.swift; sourceTree = "<group>"; };
+		2FD37A55B4D85D883E29C744 /* ScatterChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartDataProvider.swift; path = Source/Charts/Interfaces/ScatterChartDataProvider.swift; sourceTree = "<group>"; };
+		30EFAD7920F76360ADB3B5F5 /* ChartViewBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartViewBase.swift; path = Source/Charts/Charts/ChartViewBase.swift; sourceTree = "<group>"; };
+		324C9127B53A8D39C8B49277 /* TransformerHorizontalBarChart.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TransformerHorizontalBarChart.swift; path = Source/Charts/Utils/TransformerHorizontalBarChart.swift; sourceTree = "<group>"; };
+		32FC01A016DFF1BA73AF9182 /* SquareShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SquareShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/SquareShapeRenderer.swift; sourceTree = "<group>"; };
+		33BE9A97FFA41D3D85CAFFC7 /* HorizontalBarHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HorizontalBarHighlighter.swift; path = Source/Charts/Highlight/HorizontalBarHighlighter.swift; sourceTree = "<group>"; };
+		392AAEB02DD7B351D92907C2 /* MarkerImage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MarkerImage.swift; path = Source/Charts/Components/MarkerImage.swift; sourceTree = "<group>"; };
+		3976E5F9D60E30CD94CE6156 /* Animator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Animator.swift; path = Source/Charts/Animation/Animator.swift; sourceTree = "<group>"; };
+		3A32510073A303CBB38E094A /* IChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IChartDataSet.swift; path = Source/Charts/Data/Interfaces/IChartDataSet.swift; sourceTree = "<group>"; };
+		3D64616883374310C505EC39 /* Highlight.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Highlight.swift; path = Source/Charts/Highlight/Highlight.swift; sourceTree = "<group>"; };
+		3ED23C354AFE81818D78E645 /* Platform.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.swift; path = Source/Charts/Utils/Platform.swift; sourceTree = "<group>"; };
+		3F8146ABC9FC311AF8CA699C /* CandleChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleChartDataProvider.swift; path = Source/Charts/Interfaces/CandleChartDataProvider.swift; sourceTree = "<group>"; };
+		3FDA09EF973925A110506799 /* ChartUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartUtils.swift; path = Source/Charts/Utils/ChartUtils.swift; sourceTree = "<group>"; };
+		41DDB768A1D033A34F0EF9E0 /* Media.xcassets */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder.assetcatalog; name = Media.xcassets; path = "Tests/Supporting Files/Media.xcassets"; sourceTree = "<group>"; };
+		429E88F2729735DC092EE556 /* ILineChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ILineChartDataSet.swift; path = Source/Charts/Data/Interfaces/ILineChartDataSet.swift; sourceTree = "<group>"; };
+		45C6D3723C4E001B119CA0C8 /* BarLineChartViewBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarLineChartViewBase.swift; path = Source/Charts/Charts/BarLineChartViewBase.swift; sourceTree = "<group>"; };
+		45E31A4356CC6F283C29954B /* LineRadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineRadarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift; sourceTree = "<group>"; };
+		46D8013D44629521B1746364 /* PieChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartRenderer.swift; path = Source/Charts/Renderers/PieChartRenderer.swift; sourceTree = "<group>"; };
+		48164CCD83C51B496533CB77 /* MarkerView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MarkerView.swift; path = Source/Charts/Components/MarkerView.swift; sourceTree = "<group>"; };
+		4A6C9631C69B2D772BBD9232 /* PieRadarChartViewBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieRadarChartViewBase.swift; path = Source/Charts/Charts/PieRadarChartViewBase.swift; sourceTree = "<group>"; };
+		4B7AEFBF4D85B9D2EAAB3071 /* AxisBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AxisBase.swift; path = Source/Charts/Components/AxisBase.swift; sourceTree = "<group>"; };
+		4BBB57D6FA41029B08F26D7B /* RadarChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarChartData.swift; path = Source/Charts/Data/Implementations/Standard/RadarChartData.swift; sourceTree = "<group>"; };
+		4C2EA58CB336967198D30D20 /* AnimatedZoomViewJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnimatedZoomViewJob.swift; path = Source/Charts/Jobs/AnimatedZoomViewJob.swift; sourceTree = "<group>"; };
+		4C978F31F23C7D21197DC2A1 /* LineChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartData.swift; path = Source/Charts/Data/Implementations/Standard/LineChartData.swift; sourceTree = "<group>"; };
+		4EAA8AA30C377D54D22A577A /* IValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IValueFormatter.swift; path = Source/Charts/Formatters/IValueFormatter.swift; sourceTree = "<group>"; };
+		4EED352A98860E031F13AFB7 /* BubbleChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartView.swift; path = Source/Charts/Charts/BubbleChartView.swift; sourceTree = "<group>"; };
+		4F7E6A99D82E6AE3804D5A39 /* ILineRadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ILineRadarChartDataSet.swift; path = Source/Charts/Data/Interfaces/ILineRadarChartDataSet.swift; sourceTree = "<group>"; };
+		4F9922F0641F7955DC6CD324 /* Charts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Charts.h; path = "Source/Supporting Files/Charts.h"; sourceTree = "<group>"; };
+		5225ABC3C0C2F65FC094EEBB /* XAxis.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxis.swift; path = Source/Charts/Components/XAxis.swift; sourceTree = "<group>"; };
+		52265C1B343CCC41AF2300E3 /* CombinedChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedChartRenderer.swift; path = Source/Charts/Renderers/CombinedChartRenderer.swift; sourceTree = "<group>"; };
+		539382766378B702660FDFB2 /* HorizontalBarChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartRenderer.swift; path = Source/Charts/Renderers/HorizontalBarChartRenderer.swift; sourceTree = "<group>"; };
+		543729805D897CC03E5F78D3 /* BarHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarHighlighter.swift; path = Source/Charts/Highlight/BarHighlighter.swift; sourceTree = "<group>"; };
+		559DB735FEA17AB90676D6CA /* BarLineScatterCandleBubbleChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarLineScatterCandleBubbleChartData.swift; path = Source/Charts/Data/Implementations/Standard/BarLineScatterCandleBubbleChartData.swift; sourceTree = "<group>"; };
+		596963A429D485E3894C4666 /* IMarker.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IMarker.swift; path = Source/Charts/Components/IMarker.swift; sourceTree = "<group>"; };
+		5983826927D825EF5F855C28 /* ChartHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartHighlighter.swift; path = Source/Charts/Highlight/ChartHighlighter.swift; sourceTree = "<group>"; };
+		5A4CFFFB65819121595F06F1 /* Fill.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Fill.swift; path = Source/Charts/Utils/Fill.swift; sourceTree = "<group>"; };
+		5B1C588E9DF6FFD56D7ADF8E /* BarLineScatterCandleBubbleRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarLineScatterCandleBubbleRenderer.swift; path = Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift; sourceTree = "<group>"; };
+		5C3F5E1A69EC06E86505F7B1 /* BarChartTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartTests.swift; path = Tests/Charts/BarChartTests.swift; sourceTree = "<group>"; };
+		6021C9E424C36116AEA78CC9 /* HorizontalBarChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartView.swift; path = Source/Charts/Charts/HorizontalBarChartView.swift; sourceTree = "<group>"; };
+		62B73FCEDD3841E7B958F6A9 /* ChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataProvider.swift; path = Source/Charts/Interfaces/ChartDataProvider.swift; sourceTree = "<group>"; };
+		65AD9E95D9ED4DC0BD73A743 /* Charts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Charts.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		688B80F1AA88AE54152BE768 /* YAxisRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = YAxisRenderer.swift; path = Source/Charts/Renderers/YAxisRenderer.swift; sourceTree = "<group>"; };
+		6A4770E0F75EFFC30707A7C8 /* DefaultAxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultAxisValueFormatter.swift; path = Source/Charts/Formatters/DefaultAxisValueFormatter.swift; sourceTree = "<group>"; };
+		6CEC0C69C89CE9B99F3B4409 /* ChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/ChartDataSet.swift; sourceTree = "<group>"; };
+		6D717F0808DE7EC8A4AE9C2A /* BarLineScatterCandleBubbleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarLineScatterCandleBubbleChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/BarLineScatterCandleBubbleChartDataSet.swift; sourceTree = "<group>"; };
+		6E03A4987F72414A02A0631B /* PieChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartData.swift; path = Source/Charts/Data/Implementations/Standard/PieChartData.swift; sourceTree = "<group>"; };
+		6F66B32AD8A878CBD6DB6ED2 /* Renderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Renderer.swift; path = Source/Charts/Renderers/Renderer.swift; sourceTree = "<group>"; };
+		7036F11832C017E26AC750A4 /* PieHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieHighlighter.swift; path = Source/Charts/Highlight/PieHighlighter.swift; sourceTree = "<group>"; };
+		710D7C9B2F1DB4A331EE405A /* AnimatedViewPortJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnimatedViewPortJob.swift; path = Source/Charts/Jobs/AnimatedViewPortJob.swift; sourceTree = "<group>"; };
+		72EAEBB7CF73E33565FC2896 /* ViewPortHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ViewPortHandler.swift; path = Source/Charts/Utils/ViewPortHandler.swift; sourceTree = "<group>"; };
+		75F279974FE650E57A061B09 /* BarChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartRenderer.swift; path = Source/Charts/Renderers/BarChartRenderer.swift; sourceTree = "<group>"; };
+		7A53A9E42FC07FFDACA937C1 /* IBarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IBarChartDataSet.swift; path = Source/Charts/Data/Interfaces/IBarChartDataSet.swift; sourceTree = "<group>"; };
+		7AB9062A28AAB9469752A954 /* ChartUtilsTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartUtilsTests.swift; path = Tests/Charts/ChartUtilsTests.swift; sourceTree = "<group>"; };
+		7AC9C3D69ACB5BDE22421E15 /* RadarChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarChartRenderer.swift; path = Source/Charts/Renderers/RadarChartRenderer.swift; sourceTree = "<group>"; };
+		7EDA3AD550AEFC93C8D15B9C /* BubbleChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartData.swift; path = Source/Charts/Data/Implementations/Standard/BubbleChartData.swift; sourceTree = "<group>"; };
+		80D5B764EC0AE1E17E55DC67 /* ScatterChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartRenderer.swift; path = Source/Charts/Renderers/ScatterChartRenderer.swift; sourceTree = "<group>"; };
+		818AC6B12505B7C0A53D62F9 /* IFillFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IFillFormatter.swift; path = Source/Charts/Formatters/IFillFormatter.swift; sourceTree = "<group>"; };
+		823F7DB281C6C6F069A69605 /* CrossShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CrossShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/CrossShapeRenderer.swift; sourceTree = "<group>"; };
+		8FF03960A871A092F5B54315 /* BarLineScatterCandleBubbleChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarLineScatterCandleBubbleChartDataProvider.swift; path = Source/Charts/Interfaces/BarLineScatterCandleBubbleChartDataProvider.swift; sourceTree = "<group>"; };
+		910DBFE1DA1B2CA237A736DF /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Source/Supporting Files/Info.plist"; sourceTree = "<group>"; };
+		91EEEDE2AB8F2DA3AFCF0733 /* RadarChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/RadarChartDataEntry.swift; sourceTree = "<group>"; };
+		923206233CA89FD03565FF87 /* LineScatterCandleRadarRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineScatterCandleRadarRenderer.swift; path = Source/Charts/Renderers/LineScatterCandleRadarRenderer.swift; sourceTree = "<group>"; };
+		9249AD9AEC8C85772365A128 /* ILineScatterCandleRadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ILineScatterCandleRadarChartDataSet.swift; path = Source/Charts/Data/Interfaces/ILineScatterCandleRadarChartDataSet.swift; sourceTree = "<group>"; };
+		93EF9709CF635BEE70D1ABC5 /* DataApproximator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DataApproximator.swift; path = Source/Charts/Filters/DataApproximator.swift; sourceTree = "<group>"; };
+		97AD2D4520AF917100F9C24A /* Platform+Accessibility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Platform+Accessibility.swift"; path = "Source/Charts/Utils/Platform+Accessibility.swift"; sourceTree = "<group>"; };
+		998F2BFE318471AFC05B50AC /* IHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IHighlighter.swift; path = Source/Charts/Highlight/IHighlighter.swift; sourceTree = "<group>"; };
+		9A26C8DA1F87B01700367599 /* DataApproximator+N.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "DataApproximator+N.swift"; path = "Source/Charts/Filters/DataApproximator+N.swift"; sourceTree = "<group>"; };
+		9D7184C8A5A60A3522AB9B05 /* BarChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartDataProvider.swift; path = Source/Charts/Interfaces/BarChartDataProvider.swift; sourceTree = "<group>"; };
+		9DCD13D558BA177D5952AD66 /* PieChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartView.swift; path = Source/Charts/Charts/PieChartView.swift; sourceTree = "<group>"; };
+		9E7C673B9ED4340F550A9283 /* LegendEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LegendEntry.swift; path = Source/Charts/Components/LegendEntry.swift; sourceTree = "<group>"; };
+		A140F644332704916947B58C /* CombinedChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedChartDataProvider.swift; path = Source/Charts/Interfaces/CombinedChartDataProvider.swift; sourceTree = "<group>"; };
+		A4FB5E3761EF8B4D1E1E1014 /* PieChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift; sourceTree = "<group>"; };
+		A5649B272BF3EBFC8A1EF0C1 /* IBarLineScatterCandleBubbleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IBarLineScatterCandleBubbleChartDataSet.swift; path = Source/Charts/Data/Interfaces/IBarLineScatterCandleBubbleChartDataSet.swift; sourceTree = "<group>"; };
+		A5A75AA73C5AA381DA517959 /* LineChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift; sourceTree = "<group>"; };
+		AA5A16F4A382813C4FE8BDF9 /* YAxisRendererRadarChart.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = YAxisRendererRadarChart.swift; path = Source/Charts/Renderers/YAxisRendererRadarChart.swift; sourceTree = "<group>"; };
+		AA70259ED16FF80D8EEB0F94 /* ChevronUpShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChevronUpShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/ChevronUpShapeRenderer.swift; sourceTree = "<group>"; };
+		B137428B41C143D5115726C4 /* Description.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Description.swift; path = Source/Charts/Components/Description.swift; sourceTree = "<group>"; };
+		B1BA6B21CBDF77A15848994F /* RadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift; sourceTree = "<group>"; };
+		B44829AF0ADA583F1F0279B7 /* BubbleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/BubbleChartDataSet.swift; sourceTree = "<group>"; };
+		B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartTests.swift; path = Tests/Charts/HorizontalBarChartTests.swift; sourceTree = "<group>"; };
+		B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CombinedChartTests.swift; path = Tests/Charts/CombinedChartTests.swift; sourceTree = "<group>"; };
+		BA157EFF2F952192C11DF937 /* AnimatedMoveViewJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnimatedMoveViewJob.swift; path = Source/Charts/Jobs/AnimatedMoveViewJob.swift; sourceTree = "<group>"; };
+		BA1A58428DC4780BAB4EAADC /* CandleStickChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleStickChartView.swift; path = Source/Charts/Charts/CandleStickChartView.swift; sourceTree = "<group>"; };
+		BC19DC2434D65FFB446A61B7 /* XAxisRendererRadarChart.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxisRendererRadarChart.swift; path = Source/Charts/Renderers/XAxisRendererRadarChart.swift; sourceTree = "<group>"; };
+		BD02157CF8CEE1189BF681DA /* PieChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/PieChartDataEntry.swift; sourceTree = "<group>"; };
+		BD5C6D20243EC2F19069AACD /* CandleStickChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleStickChartRenderer.swift; path = Source/Charts/Renderers/CandleStickChartRenderer.swift; sourceTree = "<group>"; };
+		BFABD027DAF6851088F002AC /* LineChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartDataProvider.swift; path = Source/Charts/Interfaces/LineChartDataProvider.swift; sourceTree = "<group>"; };
+		C03E6D8023DAAB2600083010 /* ChartDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartDataTests.swift; sourceTree = "<group>"; };
+		C31AA65EA27776F8C653C7E8 /* BarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift; sourceTree = "<group>"; };
+		C52E8344160B5E689DA3C25C /* ChevronDownShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChevronDownShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/ChevronDownShapeRenderer.swift; sourceTree = "<group>"; };
+		C574E1BC7E12D937A5471EF8 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Tests/Supporting Files/Info.plist"; sourceTree = "<group>"; };
+		C58BD7B14BEA440783ED8D2B /* LineScatterCandleRadarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineScatterCandleRadarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/LineScatterCandleRadarChartDataSet.swift; sourceTree = "<group>"; };
+		C75935E899183DDFA181E2CC /* AxisRendererBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AxisRendererBase.swift; path = Source/Charts/Renderers/AxisRendererBase.swift; sourceTree = "<group>"; };
+		C8C9A105A7DB64F39DDA648B /* ComponentBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ComponentBase.swift; path = Source/Charts/Components/ComponentBase.swift; sourceTree = "<group>"; };
+		C8FB6219B143F8F7DA762950 /* TriangleShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TriangleShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/TriangleShapeRenderer.swift; sourceTree = "<group>"; };
+		C9AA36092355F01F00C97D93 /* Platform+Color.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Platform+Color.swift"; path = "Source/Charts/Utils/Platform+Color.swift"; sourceTree = "<group>"; };
+		C9F3DC242355F791000C3215 /* Platform+Graphics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Platform+Graphics.swift"; path = "Source/Charts/Utils/Platform+Graphics.swift"; sourceTree = "<group>"; };
+		C9F3DC252355F791000C3215 /* Platform+Gestures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Platform+Gestures.swift"; path = "Source/Charts/Utils/Platform+Gestures.swift"; sourceTree = "<group>"; };
+		C9F3DC282355FA2F000C3215 /* Platform+Touch Handling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Platform+Touch Handling.swift"; path = "Source/Charts/Utils/Platform+Touch Handling.swift"; sourceTree = "<group>"; };
+		C9FE42E868A225C116537368 /* ChartBaseDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartBaseDataSet.swift; path = Source/Charts/Data/Implementations/ChartBaseDataSet.swift; sourceTree = "<group>"; };
+		CB1DD1A0F64266A10EE94194 /* ScatterChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/ScatterChartDataSet.swift; sourceTree = "<group>"; };
+		D2E1819D72CD7B6C4A4E8048 /* LineChartTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartTests.swift; path = Tests/Charts/LineChartTests.swift; sourceTree = "<group>"; };
+		D2E698FF540029B70AC97AD7 /* CandleChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/CandleChartDataEntry.swift; sourceTree = "<group>"; };
+		D6C1BEFDF17404666C7B6054 /* DefaultFillFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultFillFormatter.swift; path = Source/Charts/Formatters/DefaultFillFormatter.swift; sourceTree = "<group>"; };
+		DA2AA6CC89F809DCCD7605B4 /* IPieChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IPieChartDataSet.swift; path = Source/Charts/Data/Interfaces/IPieChartDataSet.swift; sourceTree = "<group>"; };
+		DD8ED233775EEC31243A6919 /* BubbleChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/BubbleChartDataEntry.swift; sourceTree = "<group>"; };
+		DFB762958EE8E6521563665D /* ChartAnimationEasing.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartAnimationEasing.swift; path = Source/Charts/Animation/ChartAnimationEasing.swift; sourceTree = "<group>"; };
+		E120E76C6F1B5877D56126DD /* ChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartData.swift; path = Source/Charts/Data/Implementations/Standard/ChartData.swift; sourceTree = "<group>"; };
+		E3F8BFF1CBC58D5B9DBFFB9B /* BarChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/BarChartDataEntry.swift; sourceTree = "<group>"; };
+		E64A75540C627E09080B402A /* Legend.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Legend.swift; path = Source/Charts/Components/Legend.swift; sourceTree = "<group>"; };
+		E783CFB4889A767C76510917 /* BarChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartView.swift; path = Source/Charts/Charts/BarChartView.swift; sourceTree = "<group>"; };
+		E7AD2FC320A16CA1EE0A52F4 /* ScatterChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartData.swift; path = Source/Charts/Data/Implementations/Standard/ScatterChartData.swift; sourceTree = "<group>"; };
+		EAE417AAA0FCA0DD00E77489 /* YAxisRendererHorizontalBarChart.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = YAxisRendererHorizontalBarChart.swift; path = Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift; sourceTree = "<group>"; };
+		ECE1B1623D3AF69CECAE8562 /* CircleShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CircleShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/CircleShapeRenderer.swift; sourceTree = "<group>"; };
+		EDEAF554FD0D68EA4C0E7E49 /* BubbleChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartDataProvider.swift; path = Source/Charts/Interfaces/BubbleChartDataProvider.swift; sourceTree = "<group>"; };
+		F22750328058DEC2F019646F /* ChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/ChartDataEntry.swift; sourceTree = "<group>"; };
+		F368CF209744D8F3B85B1028 /* RadarHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RadarHighlighter.swift; path = Source/Charts/Highlight/RadarHighlighter.swift; sourceTree = "<group>"; };
+		F3788EC55EF908B0805D7C2F /* IBubbleChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IBubbleChartDataSet.swift; path = Source/Charts/Data/Interfaces/IBubbleChartDataSet.swift; sourceTree = "<group>"; };
+		F4785FEACAE4367F36FB8868 /* CandleChartData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleChartData.swift; path = Source/Charts/Data/Implementations/Standard/CandleChartData.swift; sourceTree = "<group>"; };
+		F6227A646166E248F90F86AD /* ChartColorTemplates.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartColorTemplates.swift; path = Source/Charts/Utils/ChartColorTemplates.swift; sourceTree = "<group>"; };
+		F6DEBFAB1D73E944ED430B4F /* ChartLimitLine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartLimitLine.swift; path = Source/Charts/Components/ChartLimitLine.swift; sourceTree = "<group>"; };
+		F715DB2C56C9E0615542625B /* LegendRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LegendRenderer.swift; path = Source/Charts/Renderers/LegendRenderer.swift; sourceTree = "<group>"; };
+		FA1D3D13180C2E3893A82546 /* IShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = IShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/IShapeRenderer.swift; sourceTree = "<group>"; };
+		FA7BDB22C97F39A4B33E38A7 /* ViewPortJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ViewPortJob.swift; path = Source/Charts/Jobs/ViewPortJob.swift; sourceTree = "<group>"; };
+		FB3A4F5987E58F3E5BE855F9 /* ZoomViewJob.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ZoomViewJob.swift; path = Source/Charts/Jobs/ZoomViewJob.swift; sourceTree = "<group>"; };
+		FB92A80F861C1362EED8D946 /* YAxis.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = YAxis.swift; path = Source/Charts/Components/YAxis.swift; sourceTree = "<group>"; };
+		FF475B9593B9898853814340 /* Transformer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Transformer.swift; path = Source/Charts/Utils/Transformer.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		06165F201D8110E600722320 /* Frameworks */ = {
+		77997192275C47C45A0A2E9A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C7B150D740255670DEB9F455 /* Charts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		06165F2B1D8110E600722320 /* Frameworks */ = {
+		C16A09321DC2DCF289FF0E3B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				06165F2F1D8110E600722320 /* Charts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		06165F1A1D8110E600722320 = {
+		031D7C33F3BF172E30664862 /* Interfaces */ = {
 			isa = PBXGroup;
 			children = (
-				063FF0401D8CC9940094A042 /* Carthage.xcconfig */,
-				06500D381D81115900156E8A /* Charts */,
-				06165F321D8110E700722320 /* ChartsTests */,
-				06165F251D8110E600722320 /* Products */,
+				9D7184C8A5A60A3522AB9B05 /* BarChartDataProvider.swift */,
+				8FF03960A871A092F5B54315 /* BarLineScatterCandleBubbleChartDataProvider.swift */,
+				EDEAF554FD0D68EA4C0E7E49 /* BubbleChartDataProvider.swift */,
+				3F8146ABC9FC311AF8CA699C /* CandleChartDataProvider.swift */,
+				62B73FCEDD3841E7B958F6A9 /* ChartDataProvider.swift */,
+				A140F644332704916947B58C /* CombinedChartDataProvider.swift */,
+				BFABD027DAF6851088F002AC /* LineChartDataProvider.swift */,
+				2FD37A55B4D85D883E29C744 /* ScatterChartDataProvider.swift */,
 			);
+			name = Interfaces;
 			sourceTree = "<group>";
 		};
-		06165F251D8110E600722320 /* Products */ = {
+		033FD152BB2F906750106A85 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				06165F241D8110E600722320 /* Charts.framework */,
-				06165F2E1D8110E600722320 /* ChartsTests.xctest */,
 			);
-			name = Products;
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		098621EDFBF928494B94BEA1 /* Data */ = {
+			isa = PBXGroup;
+			children = (
+				3B9DD76FCE8D873300A822C7 /* Implementations */,
+				DB2D9648877455028EBEAA8F /* Interfaces */,
+			);
+			name = Data;
 			sourceTree = "<group>";
 		};
-		06165F321D8110E700722320 /* ChartsTests */ = {
+		20C350D33133A4D89BB365B1 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				06B3C0F21D99F85400B1DF43 /* Charts */,
-				06761B5D1D98176000D5CE09 /* ChartUtilsTests.swift */,
-				06B1210D1D811FF200D14B02 /* Supporting Files */,
+				E9F158C8C566B26AFD775911 /* Supporting Files */,
+				2647844720BC6574A544A337 /* Charts */,
 			);
-			path = ChartsTests;
+			name = Source;
 			sourceTree = "<group>";
 		};
-		06500D381D81115900156E8A /* Charts */ = {
+		2647844720BC6574A544A337 /* Charts */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FAA1D811B4300D14B02 /* Classes */,
-				06B11FAB1D811B5600D14B02 /* Supporting Files */,
+				A49C1F0F9CCD6E5C143C29F4 /* Animation */,
+				8C531E3F3C3DE5843C93C3DA /* Charts */,
+				51EF1986C9884C25EED1C2CB /* Components */,
+				098621EDFBF928494B94BEA1 /* Data */,
+				AA79AB82B0ADCA926510B73E /* Filters */,
+				74A391010038924F637D6752 /* Formatters */,
+				42824E1F334B0C484AF4C594 /* Highlight */,
+				031D7C33F3BF172E30664862 /* Interfaces */,
+				AD1224C45A29A5C88D6B7450 /* Jobs */,
+				E7589D3E7C2BD2449960AD59 /* Renderers */,
+				D047819AB7170595896D6FE8 /* Utils */,
 			);
 			name = Charts;
 			sourceTree = "<group>";
 		};
-		06B11FAA1D811B4300D14B02 /* Classes */ = {
+		3B9DD76FCE8D873300A822C7 /* Implementations */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FB01D811B8900D14B02 /* Animation */,
-				06B11FB31D811B8900D14B02 /* Charts */,
-				06B11FC01D811B8900D14B02 /* Components */,
-				06B11FCB1D811B8900D14B02 /* Data */,
-				06B11FF71D811B8900D14B02 /* Filters */,
-				06B11FF91D811B8900D14B02 /* Formatters */,
-				06B120001D811B8900D14B02 /* Highlight */,
-				06B1200B1D811B8900D14B02 /* Interfaces */,
-				06B120141D811B8900D14B02 /* Jobs */,
-				06B1201B1D811B8900D14B02 /* Renderers */,
-				06B1203B1D811B8900D14B02 /* Utils */,
+				C9FE42E868A225C116537368 /* ChartBaseDataSet.swift */,
+				740017197A160047EBB8A9A0 /* Standard */,
 			);
-			name = Classes;
+			name = Implementations;
 			sourceTree = "<group>";
 		};
-		06B11FAB1D811B5600D14B02 /* Supporting Files */ = {
+		42824E1F334B0C484AF4C594 /* Highlight */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FAE1D811B7000D14B02 /* Charts.h */,
-				06B11FAC1D811B6600D14B02 /* Info.plist */,
+				543729805D897CC03E5F78D3 /* BarHighlighter.swift */,
+				5983826927D825EF5F855C28 /* ChartHighlighter.swift */,
+				2465CB73738EBAFB46C57288 /* CombinedHighlighter.swift */,
+				3D64616883374310C505EC39 /* Highlight.swift */,
+				33BE9A97FFA41D3D85CAFFC7 /* HorizontalBarHighlighter.swift */,
+				998F2BFE318471AFC05B50AC /* IHighlighter.swift */,
+				7036F11832C017E26AC750A4 /* PieHighlighter.swift */,
+				04F7B9DF1F2D66E7279771D4 /* PieRadarHighlighter.swift */,
+				F368CF209744D8F3B85B1028 /* RadarHighlighter.swift */,
+				0F099502DA50C56204E7B744 /* Range.swift */,
 			);
-			name = "Supporting Files";
+			name = Highlight;
 			sourceTree = "<group>";
 		};
-		06B11FB01D811B8900D14B02 /* Animation */ = {
+		51EF1986C9884C25EED1C2CB /* Components */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FB11D811B8900D14B02 /* Animator.swift */,
-				06B11FB21D811B8900D14B02 /* ChartAnimationEasing.swift */,
+				4B7AEFBF4D85B9D2EAAB3071 /* AxisBase.swift */,
+				F6DEBFAB1D73E944ED430B4F /* ChartLimitLine.swift */,
+				C8C9A105A7DB64F39DDA648B /* ComponentBase.swift */,
+				B137428B41C143D5115726C4 /* Description.swift */,
+				596963A429D485E3894C4666 /* IMarker.swift */,
+				E64A75540C627E09080B402A /* Legend.swift */,
+				9E7C673B9ED4340F550A9283 /* LegendEntry.swift */,
+				392AAEB02DD7B351D92907C2 /* MarkerImage.swift */,
+				48164CCD83C51B496533CB77 /* MarkerView.swift */,
+				5225ABC3C0C2F65FC094EEBB /* XAxis.swift */,
+				FB92A80F861C1362EED8D946 /* YAxis.swift */,
 			);
-			name = Animation;
-			path = Source/Charts/Animation;
+			name = Components;
 			sourceTree = "<group>";
 		};
-		06B11FB31D811B8900D14B02 /* Charts */ = {
+		740017197A160047EBB8A9A0 /* Standard */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FB41D811B8900D14B02 /* BarChartView.swift */,
-				06B11FB51D811B8900D14B02 /* BarLineChartViewBase.swift */,
-				06B11FB61D811B8900D14B02 /* BubbleChartView.swift */,
-				06B11FB71D811B8900D14B02 /* CandleStickChartView.swift */,
-				06B11FB81D811B8900D14B02 /* ChartViewBase.swift */,
-				06B11FB91D811B8900D14B02 /* CombinedChartView.swift */,
-				06B11FBA1D811B8900D14B02 /* HorizontalBarChartView.swift */,
-				06B11FBB1D811B8900D14B02 /* LineChartView.swift */,
-				06B11FBC1D811B8900D14B02 /* PieChartView.swift */,
-				06B11FBD1D811B8900D14B02 /* PieRadarChartViewBase.swift */,
-				06B11FBE1D811B8900D14B02 /* RadarChartView.swift */,
-				06B11FBF1D811B8900D14B02 /* ScatterChartView.swift */,
+				0108D5925E21A47DA36A66AA /* BarChartData.swift */,
+				E3F8BFF1CBC58D5B9DBFFB9B /* BarChartDataEntry.swift */,
+				C31AA65EA27776F8C653C7E8 /* BarChartDataSet.swift */,
+				559DB735FEA17AB90676D6CA /* BarLineScatterCandleBubbleChartData.swift */,
+				6D717F0808DE7EC8A4AE9C2A /* BarLineScatterCandleBubbleChartDataSet.swift */,
+				7EDA3AD550AEFC93C8D15B9C /* BubbleChartData.swift */,
+				DD8ED233775EEC31243A6919 /* BubbleChartDataEntry.swift */,
+				B44829AF0ADA583F1F0279B7 /* BubbleChartDataSet.swift */,
+				F4785FEACAE4367F36FB8868 /* CandleChartData.swift */,
+				D2E698FF540029B70AC97AD7 /* CandleChartDataEntry.swift */,
+				274116834B1B0345D622E027 /* CandleChartDataSet.swift */,
+				E120E76C6F1B5877D56126DD /* ChartData.swift */,
+				F22750328058DEC2F019646F /* ChartDataEntry.swift */,
+				12409C3EA15787C11AF0D2BC /* ChartDataEntryBase.swift */,
+				6CEC0C69C89CE9B99F3B4409 /* ChartDataSet.swift */,
+				0DDE409E9ECF54D2C146A6F0 /* CombinedChartData.swift */,
+				4C978F31F23C7D21197DC2A1 /* LineChartData.swift */,
+				A5A75AA73C5AA381DA517959 /* LineChartDataSet.swift */,
+				45E31A4356CC6F283C29954B /* LineRadarChartDataSet.swift */,
+				C58BD7B14BEA440783ED8D2B /* LineScatterCandleRadarChartDataSet.swift */,
+				6E03A4987F72414A02A0631B /* PieChartData.swift */,
+				BD02157CF8CEE1189BF681DA /* PieChartDataEntry.swift */,
+				A4FB5E3761EF8B4D1E1E1014 /* PieChartDataSet.swift */,
+				4BBB57D6FA41029B08F26D7B /* RadarChartData.swift */,
+				91EEEDE2AB8F2DA3AFCF0733 /* RadarChartDataEntry.swift */,
+				B1BA6B21CBDF77A15848994F /* RadarChartDataSet.swift */,
+				E7AD2FC320A16CA1EE0A52F4 /* ScatterChartData.swift */,
+				CB1DD1A0F64266A10EE94194 /* ScatterChartDataSet.swift */,
 			);
-			name = Charts;
-			path = Source/Charts/Charts;
+			name = Standard;
 			sourceTree = "<group>";
 		};
-		06B11FC01D811B8900D14B02 /* Components */ = {
+		74A391010038924F637D6752 /* Formatters */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FC11D811B8900D14B02 /* AxisBase.swift */,
-				06B11FC21D811B8900D14B02 /* ChartLimitLine.swift */,
-				06B11FC31D811B8900D14B02 /* ComponentBase.swift */,
-				5B56A9CC1D905EB300F58178 /* Description.swift */,
-				06B11FC41D811B8900D14B02 /* IMarker.swift */,
-				06B11FC51D811B8900D14B02 /* Legend.swift */,
-				06B11FC61D811B8900D14B02 /* LegendEntry.swift */,
-				06B11FC71D811B8900D14B02 /* MarkerImage.swift */,
-				06B11FC81D811B8900D14B02 /* MarkerView.swift */,
-				06B11FC91D811B8900D14B02 /* XAxis.swift */,
-				06B11FCA1D811B8900D14B02 /* YAxis.swift */,
+				6A4770E0F75EFFC30707A7C8 /* DefaultAxisValueFormatter.swift */,
+				D6C1BEFDF17404666C7B6054 /* DefaultFillFormatter.swift */,
+				107D8F8163EE54D6D9E916B0 /* DefaultValueFormatter.swift */,
+				0BD9DF16AF59680A3BB49452 /* IAxisValueFormatter.swift */,
+				818AC6B12505B7C0A53D62F9 /* IFillFormatter.swift */,
+				10DD0A02E3CF611BD11EBA9B /* IndexAxisValueFormatter.swift */,
+				4EAA8AA30C377D54D22A577A /* IValueFormatter.swift */,
 			);
-			name = Components;
-			path = Source/Charts/Components;
+			name = Formatters;
 			sourceTree = "<group>";
 		};
-		06B11FCB1D811B8900D14B02 /* Data */ = {
+		865A1CF149F52850CAB7F177 = {
 			isa = PBXGroup;
 			children = (
-				06B11FCC1D811B8900D14B02 /* Implementations */,
-				06B11FEB1D811B8900D14B02 /* Interfaces */,
+				AB2D554102718F209377399E /* Products */,
+				033FD152BB2F906750106A85 /* Frameworks */,
+				20C350D33133A4D89BB365B1 /* Source */,
+				D2C26AC015E753014C7571E4 /* Tests */,
 			);
-			name = Data;
-			path = Source/Charts/Data;
 			sourceTree = "<group>";
 		};
-		06B11FCC1D811B8900D14B02 /* Implementations */ = {
+		8C531E3F3C3DE5843C93C3DA /* Charts */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FCD1D811B8900D14B02 /* ChartBaseDataSet.swift */,
-				06B11FCE1D811B8900D14B02 /* Standard */,
+				E783CFB4889A767C76510917 /* BarChartView.swift */,
+				45C6D3723C4E001B119CA0C8 /* BarLineChartViewBase.swift */,
+				4EED352A98860E031F13AFB7 /* BubbleChartView.swift */,
+				BA1A58428DC4780BAB4EAADC /* CandleStickChartView.swift */,
+				30EFAD7920F76360ADB3B5F5 /* ChartViewBase.swift */,
+				11EF1FE22549E885C8F40738 /* CombinedChartView.swift */,
+				6021C9E424C36116AEA78CC9 /* HorizontalBarChartView.swift */,
+				0619A877C69A95ECCC440A44 /* LineChartView.swift */,
+				9DCD13D558BA177D5952AD66 /* PieChartView.swift */,
+				4A6C9631C69B2D772BBD9232 /* PieRadarChartViewBase.swift */,
+				2440DB759AB93B4A928A3F6F /* RadarChartView.swift */,
+				18462BFDD9DEE76D51D40503 /* ScatterChartView.swift */,
 			);
-			path = Implementations;
+			name = Charts;
 			sourceTree = "<group>";
 		};
-		06B11FCE1D811B8900D14B02 /* Standard */ = {
+		9613A7C800C7F065A823D587 /* Charts */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FCF1D811B8900D14B02 /* BarChartData.swift */,
-				06B11FD01D811B8900D14B02 /* BarChartDataEntry.swift */,
-				06B11FD11D811B8900D14B02 /* BarChartDataSet.swift */,
-				06B11FD21D811B8900D14B02 /* BarLineScatterCandleBubbleChartData.swift */,
-				06B11FD31D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataSet.swift */,
-				06B11FD41D811B8900D14B02 /* BubbleChartData.swift */,
-				06B11FD51D811B8900D14B02 /* BubbleChartDataEntry.swift */,
-				06B11FD61D811B8900D14B02 /* BubbleChartDataSet.swift */,
-				06B11FD71D811B8900D14B02 /* CandleChartData.swift */,
-				06B11FD81D811B8900D14B02 /* CandleChartDataEntry.swift */,
-				06B11FD91D811B8900D14B02 /* CandleChartDataSet.swift */,
-				06B11FDA1D811B8900D14B02 /* ChartData.swift */,
-				06B11FDB1D811B8900D14B02 /* ChartDataEntry.swift */,
-				06B11FDC1D811B8900D14B02 /* ChartDataEntryBase.swift */,
-				06B11FDD1D811B8900D14B02 /* ChartDataSet.swift */,
-				06B11FDE1D811B8900D14B02 /* CombinedChartData.swift */,
-				06B11FDF1D811B8900D14B02 /* LineChartData.swift */,
-				06B11FE01D811B8900D14B02 /* LineChartDataSet.swift */,
-				06B11FE11D811B8900D14B02 /* LineRadarChartDataSet.swift */,
-				06B11FE21D811B8900D14B02 /* LineScatterCandleRadarChartDataSet.swift */,
-				06B11FE31D811B8900D14B02 /* PieChartData.swift */,
-				06B11FE41D811B8900D14B02 /* PieChartDataEntry.swift */,
-				06B11FE51D811B8900D14B02 /* PieChartDataSet.swift */,
-				06B11FE61D811B8900D14B02 /* RadarChartData.swift */,
-				06B11FE71D811B8900D14B02 /* RadarChartDataEntry.swift */,
-				06B11FE81D811B8900D14B02 /* RadarChartDataSet.swift */,
-				06B11FE91D811B8900D14B02 /* ScatterChartData.swift */,
-				06B11FEA1D811B8900D14B02 /* ScatterChartDataSet.swift */,
+				5C3F5E1A69EC06E86505F7B1 /* BarChartTests.swift */,
+				B66817452241E3CC00017CF1 /* HorizontalBarChartTests.swift */,
+				224EFF981FBAAC4700CF9B3B /* EquatableTests.swift */,
+				7AB9062A28AAB9469752A954 /* ChartUtilsTests.swift */,
+				B6BF9A551F91993A00E62A5D /* CombinedChartTests.swift */,
+				D2E1819D72CD7B6C4A4E8048 /* LineChartTests.swift */,
+				135F11CD20425AF600D655A3 /* PieChartTests.swift */,
+				064989451F5C99C7006E8BB3 /* Snapshot.swift */,
+				C03E6D8023DAAB2600083010 /* ChartDataTests.swift */,
 			);
-			path = Standard;
+			name = Charts;
 			sourceTree = "<group>";
 		};
-		06B11FEB1D811B8900D14B02 /* Interfaces */ = {
+		A49C1F0F9CCD6E5C143C29F4 /* Animation */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FEC1D811B8900D14B02 /* IBarChartDataSet.swift */,
-				06B11FED1D811B8900D14B02 /* IBarLineScatterCandleBubbleChartDataSet.swift */,
-				06B11FEE1D811B8900D14B02 /* IBubbleChartDataSet.swift */,
-				06B11FEF1D811B8900D14B02 /* ICandleChartDataSet.swift */,
-				06B11FF01D811B8900D14B02 /* IChartDataSet.swift */,
-				06B11FF11D811B8900D14B02 /* ILineChartDataSet.swift */,
-				06B11FF21D811B8900D14B02 /* ILineRadarChartDataSet.swift */,
-				06B11FF31D811B8900D14B02 /* ILineScatterCandleRadarChartDataSet.swift */,
-				06B11FF41D811B8900D14B02 /* IPieChartDataSet.swift */,
-				06B11FF51D811B8900D14B02 /* IRadarChartDataSet.swift */,
-				06B11FF61D811B8900D14B02 /* IScatterChartDataSet.swift */,
+				3976E5F9D60E30CD94CE6156 /* Animator.swift */,
+				DFB762958EE8E6521563665D /* ChartAnimationEasing.swift */,
 			);
-			path = Interfaces;
+			name = Animation;
 			sourceTree = "<group>";
 		};
-		06B11FF71D811B8900D14B02 /* Filters */ = {
+		AA79AB82B0ADCA926510B73E /* Filters */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FF81D811B8900D14B02 /* DataApproximator.swift */,
+				93EF9709CF635BEE70D1ABC5 /* DataApproximator.swift */,
+				9A26C8DA1F87B01700367599 /* DataApproximator+N.swift */,
 			);
 			name = Filters;
-			path = Source/Charts/Filters;
 			sourceTree = "<group>";
 		};
-		06B11FF91D811B8900D14B02 /* Formatters */ = {
+		AB2D554102718F209377399E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				06B11FFA1D811B8900D14B02 /* DefaultAxisValueFormatter.swift */,
-				06B11FFB1D811B8900D14B02 /* DefaultFillFormatter.swift */,
-				06B11FFC1D811B8900D14B02 /* DefaultValueFormatter.swift */,
-				06B11FFD1D811B8900D14B02 /* IAxisValueFormatter.swift */,
-				06B11FFE1D811B8900D14B02 /* IFillFormatter.swift */,
-				06B11FFF1D811B8900D14B02 /* IValueFormatter.swift */,
-				5BF8813A1DDC4DF70033370C /* IndexAxisValueFormatter.swift */,
+				65AD9E95D9ED4DC0BD73A743 /* Charts.framework */,
+				1CBBC58C6CE1EBEE9852CE41 /* ChartsTests.xctest */,
 			);
-			name = Formatters;
-			path = Source/Charts/Formatters;
+			name = Products;
 			sourceTree = "<group>";
 		};
-		06B120001D811B8900D14B02 /* Highlight */ = {
+		AD1224C45A29A5C88D6B7450 /* Jobs */ = {
 			isa = PBXGroup;
 			children = (
-				06B120011D811B8900D14B02 /* BarHighlighter.swift */,
-				06B120021D811B8900D14B02 /* ChartHighlighter.swift */,
-				06B120031D811B8900D14B02 /* CombinedHighlighter.swift */,
-				06B120041D811B8900D14B02 /* Highlight.swift */,
-				06B120051D811B8900D14B02 /* HorizontalBarHighlighter.swift */,
-				06B120061D811B8900D14B02 /* IHighlighter.swift */,
-				06B120071D811B8900D14B02 /* PieHighlighter.swift */,
-				06B120081D811B8900D14B02 /* PieRadarHighlighter.swift */,
-				06B120091D811B8900D14B02 /* RadarHighlighter.swift */,
-				06B1200A1D811B8900D14B02 /* Range.swift */,
+				BA157EFF2F952192C11DF937 /* AnimatedMoveViewJob.swift */,
+				710D7C9B2F1DB4A331EE405A /* AnimatedViewPortJob.swift */,
+				4C2EA58CB336967198D30D20 /* AnimatedZoomViewJob.swift */,
+				266E162DA8B29D9AEB6A9397 /* MoveViewJob.swift */,
+				FA7BDB22C97F39A4B33E38A7 /* ViewPortJob.swift */,
+				FB3A4F5987E58F3E5BE855F9 /* ZoomViewJob.swift */,
 			);
-			name = Highlight;
-			path = Source/Charts/Highlight;
+			name = Jobs;
 			sourceTree = "<group>";
 		};
-		06B1200B1D811B8900D14B02 /* Interfaces */ = {
+		BF662941E21BC049994B2598 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				06B1200C1D811B8900D14B02 /* BarChartDataProvider.swift */,
-				06B1200D1D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataProvider.swift */,
-				06B1200E1D811B8900D14B02 /* BubbleChartDataProvider.swift */,
-				06B1200F1D811B8900D14B02 /* CandleChartDataProvider.swift */,
-				06B120101D811B8900D14B02 /* ChartDataProvider.swift */,
-				06B120111D811B8900D14B02 /* CombinedChartDataProvider.swift */,
-				06B120121D811B8900D14B02 /* LineChartDataProvider.swift */,
-				06B120131D811B8900D14B02 /* ScatterChartDataProvider.swift */,
+				C574E1BC7E12D937A5471EF8 /* Info.plist */,
+				41DDB768A1D033A34F0EF9E0 /* Media.xcassets */,
 			);
-			name = Interfaces;
-			path = Source/Charts/Interfaces;
+			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		06B120141D811B8900D14B02 /* Jobs */ = {
+		D047819AB7170595896D6FE8 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
-				06B120151D811B8900D14B02 /* AnimatedMoveViewJob.swift */,
-				06B120161D811B8900D14B02 /* AnimatedViewPortJob.swift */,
-				06B120171D811B8900D14B02 /* AnimatedZoomViewJob.swift */,
-				06B120181D811B8900D14B02 /* MoveViewJob.swift */,
-				06B120191D811B8900D14B02 /* ViewPortJob.swift */,
-				06B1201A1D811B8900D14B02 /* ZoomViewJob.swift */,
+				F6227A646166E248F90F86AD /* ChartColorTemplates.swift */,
+				3FDA09EF973925A110506799 /* ChartUtils.swift */,
+				5A4CFFFB65819121595F06F1 /* Fill.swift */,
+				3ED23C354AFE81818D78E645 /* Platform.swift */,
+				97AD2D4520AF917100F9C24A /* Platform+Accessibility.swift */,
+				C9AA36092355F01F00C97D93 /* Platform+Color.swift */,
+				C9F3DC252355F791000C3215 /* Platform+Gestures.swift */,
+				C9F3DC242355F791000C3215 /* Platform+Graphics.swift */,
+				C9F3DC282355FA2F000C3215 /* Platform+Touch Handling.swift */,
+				FF475B9593B9898853814340 /* Transformer.swift */,
+				324C9127B53A8D39C8B49277 /* TransformerHorizontalBarChart.swift */,
+				72EAEBB7CF73E33565FC2896 /* ViewPortHandler.swift */,
 			);
-			name = Jobs;
-			path = Source/Charts/Jobs;
+			name = Utils;
 			sourceTree = "<group>";
 		};
-		06B1201B1D811B8900D14B02 /* Renderers */ = {
+		D2C26AC015E753014C7571E4 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
-				06B1201C1D811B8900D14B02 /* AxisRendererBase.swift */,
-				06B1201D1D811B8900D14B02 /* BarChartRenderer.swift */,
-				06B1201E1D811B8900D14B02 /* BarLineScatterCandleBubbleRenderer.swift */,
-				06B1201F1D811B8900D14B02 /* BubbleChartRenderer.swift */,
-				06B120201D811B8900D14B02 /* CandleStickChartRenderer.swift */,
-				06B120211D811B8900D14B02 /* ChartDataRendererBase.swift */,
-				06B120221D811B8900D14B02 /* CombinedChartRenderer.swift */,
-				06B120231D811B8900D14B02 /* HorizontalBarChartRenderer.swift */,
-				06B120241D811B8900D14B02 /* LegendRenderer.swift */,
-				06B120251D811B8900D14B02 /* LineChartRenderer.swift */,
-				06B120261D811B8900D14B02 /* LineRadarRenderer.swift */,
-				06B120271D811B8900D14B02 /* LineScatterCandleRadarRenderer.swift */,
-				06B120281D811B8900D14B02 /* PieChartRenderer.swift */,
-				06B120291D811B8900D14B02 /* RadarChartRenderer.swift */,
-				06B1202A1D811B8900D14B02 /* Renderer.swift */,
-				06B1202B1D811B8900D14B02 /* Scatter */,
-				06B120341D811B8900D14B02 /* ScatterChartRenderer.swift */,
-				06B120351D811B8900D14B02 /* XAxisRenderer.swift */,
-				06B120361D811B8900D14B02 /* XAxisRendererHorizontalBarChart.swift */,
-				06B120371D811B8900D14B02 /* XAxisRendererRadarChart.swift */,
-				06B120381D811B8900D14B02 /* YAxisRenderer.swift */,
-				06B120391D811B8900D14B02 /* YAxisRendererHorizontalBarChart.swift */,
-				06B1203A1D811B8900D14B02 /* YAxisRendererRadarChart.swift */,
+				BF662941E21BC049994B2598 /* Supporting Files */,
+				9613A7C800C7F065A823D587 /* Charts */,
 			);
-			name = Renderers;
-			path = Source/Charts/Renderers;
+			name = Tests;
 			sourceTree = "<group>";
 		};
-		06B1202B1D811B8900D14B02 /* Scatter */ = {
+		DB2D9648877455028EBEAA8F /* Interfaces */ = {
 			isa = PBXGroup;
 			children = (
-				06B1202C1D811B8900D14B02 /* ChevronDownShapeRenderer.swift */,
-				06B1202D1D811B8900D14B02 /* ChevronUpShapeRenderer.swift */,
-				06B1202E1D811B8900D14B02 /* CircleShapeRenderer.swift */,
-				06B1202F1D811B8900D14B02 /* CrossShapeRenderer.swift */,
-				06B120301D811B8900D14B02 /* IShapeRenderer.swift */,
-				06B120311D811B8900D14B02 /* SquareShapeRenderer.swift */,
-				06B120321D811B8900D14B02 /* TriangleShapeRenderer.swift */,
-				06B120331D811B8900D14B02 /* XShapeRenderer.swift */,
+				7A53A9E42FC07FFDACA937C1 /* IBarChartDataSet.swift */,
+				A5649B272BF3EBFC8A1EF0C1 /* IBarLineScatterCandleBubbleChartDataSet.swift */,
+				F3788EC55EF908B0805D7C2F /* IBubbleChartDataSet.swift */,
+				18BFB0A14A5C47A302A597D9 /* ICandleChartDataSet.swift */,
+				3A32510073A303CBB38E094A /* IChartDataSet.swift */,
+				429E88F2729735DC092EE556 /* ILineChartDataSet.swift */,
+				4F7E6A99D82E6AE3804D5A39 /* ILineRadarChartDataSet.swift */,
+				9249AD9AEC8C85772365A128 /* ILineScatterCandleRadarChartDataSet.swift */,
+				DA2AA6CC89F809DCCD7605B4 /* IPieChartDataSet.swift */,
+				2EAD807534620E3B53327F04 /* IRadarChartDataSet.swift */,
+				219BC9CEA037F897E92E45D1 /* IScatterChartDataSet.swift */,
 			);
-			path = Scatter;
+			name = Interfaces;
 			sourceTree = "<group>";
 		};
-		06B1203B1D811B8900D14B02 /* Utils */ = {
+		E7589D3E7C2BD2449960AD59 /* Renderers */ = {
 			isa = PBXGroup;
 			children = (
-				06B1203C1D811B8900D14B02 /* ChartColorTemplates.swift */,
-				06B1203D1D811B8900D14B02 /* ChartUtils.swift */,
-				06B1203E1D811B8900D14B02 /* Fill.swift */,
-				06B1203F1D811B8900D14B02 /* Platform.swift */,
-				06B120401D811B8900D14B02 /* Transformer.swift */,
-				06B120411D811B8900D14B02 /* TransformerHorizontalBarChart.swift */,
-				06B120421D811B8900D14B02 /* ViewPortHandler.swift */,
+				C75935E899183DDFA181E2CC /* AxisRendererBase.swift */,
+				75F279974FE650E57A061B09 /* BarChartRenderer.swift */,
+				5B1C588E9DF6FFD56D7ADF8E /* BarLineScatterCandleBubbleRenderer.swift */,
+				2194AA554712E6BA2677F114 /* BubbleChartRenderer.swift */,
+				BD5C6D20243EC2F19069AACD /* CandleStickChartRenderer.swift */,
+				0216EDC6A1FE272F4EB19FCF /* ChartDataRendererBase.swift */,
+				52265C1B343CCC41AF2300E3 /* CombinedChartRenderer.swift */,
+				539382766378B702660FDFB2 /* HorizontalBarChartRenderer.swift */,
+				F715DB2C56C9E0615542625B /* LegendRenderer.swift */,
+				0DABDBBCCE6B3620C967F04A /* LineChartRenderer.swift */,
+				105FFC9D3773A9C7A60A897F /* LineRadarRenderer.swift */,
+				923206233CA89FD03565FF87 /* LineScatterCandleRadarRenderer.swift */,
+				46D8013D44629521B1746364 /* PieChartRenderer.swift */,
+				7AC9C3D69ACB5BDE22421E15 /* RadarChartRenderer.swift */,
+				6F66B32AD8A878CBD6DB6ED2 /* Renderer.swift */,
+				F7059584CB30EF419CFB3335 /* Scatter */,
+				80D5B764EC0AE1E17E55DC67 /* ScatterChartRenderer.swift */,
+				1C02C3AF5C92FCFC18224C35 /* XAxisRenderer.swift */,
+				1F3D55A7E6176D52DC957D27 /* XAxisRendererHorizontalBarChart.swift */,
+				BC19DC2434D65FFB446A61B7 /* XAxisRendererRadarChart.swift */,
+				688B80F1AA88AE54152BE768 /* YAxisRenderer.swift */,
+				EAE417AAA0FCA0DD00E77489 /* YAxisRendererHorizontalBarChart.swift */,
+				AA5A16F4A382813C4FE8BDF9 /* YAxisRendererRadarChart.swift */,
 			);
-			name = Utils;
-			path = Source/Charts/Utils;
+			name = Renderers;
 			sourceTree = "<group>";
 		};
-		06B1210D1D811FF200D14B02 /* Supporting Files */ = {
+		E9F158C8C566B26AFD775911 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				06B121111D81201C00D14B02 /* Info.plist */,
-				D8A58A401DCE2EF8007BB012 /* Media.xcassets */,
+				910DBFE1DA1B2CA237A736DF /* Info.plist */,
+				4F9922F0641F7955DC6CD324 /* Charts.h */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		06B3C0F21D99F85400B1DF43 /* Charts */ = {
+		F7059584CB30EF419CFB3335 /* Scatter */ = {
 			isa = PBXGroup;
 			children = (
-				06B3C0F31D99F85400B1DF43 /* BarChartTests.swift */,
-				06B3C0F41D99F85400B1DF43 /* LineChartTests.swift */,
+				C52E8344160B5E689DA3C25C /* ChevronDownShapeRenderer.swift */,
+				AA70259ED16FF80D8EEB0F94 /* ChevronUpShapeRenderer.swift */,
+				ECE1B1623D3AF69CECAE8562 /* CircleShapeRenderer.swift */,
+				823F7DB281C6C6F069A69605 /* CrossShapeRenderer.swift */,
+				FA1D3D13180C2E3893A82546 /* IShapeRenderer.swift */,
+				32FC01A016DFF1BA73AF9182 /* SquareShapeRenderer.swift */,
+				C8FB6219B143F8F7DA762950 /* TriangleShapeRenderer.swift */,
+				23D35CF6F9177D77B6B97AE1 /* XShapeRenderer.swift */,
 			);
-			name = Charts;
-			path = Tests/Charts;
-			sourceTree = SOURCE_ROOT;
+			name = Scatter;
+			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		06165F211D8110E600722320 /* Headers */ = {
+		B2B2DD73E237562739EE1F83 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				06B11FAF1D811B7000D14B02 /* Charts.h in Headers */,
+				BEFD9518F3A74ACF8FA33308 /* Charts.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		06165F231D8110E600722320 /* Charts */ = {
+		A58A4ED274A941CA248EA921 /* Charts */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 06165F381D8110E700722320 /* Build configuration list for PBXNativeTarget "Charts" */;
+			buildConfigurationList = F1D4AA9E26EA32041FC0E3B6 /* Build configuration list for PBXNativeTarget "Charts" */;
 			buildPhases = (
-				06165F1F1D8110E600722320 /* Sources */,
-				06165F201D8110E600722320 /* Frameworks */,
-				06165F211D8110E600722320 /* Headers */,
-				06165F221D8110E600722320 /* Resources */,
+				B2B2DD73E237562739EE1F83 /* Headers */,
+				B5996DB2D9B6F0DB0E9D3F3E /* Sources */,
+				E257C254E738A8AE047C6FB6 /* Resources */,
+				C16A09321DC2DCF289FF0E3B /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -692,481 +722,561 @@
 			);
 			name = Charts;
 			productName = Charts;
-			productReference = 06165F241D8110E600722320 /* Charts.framework */;
+			productReference = 65AD9E95D9ED4DC0BD73A743 /* Charts.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		06165F2D1D8110E600722320 /* ChartsTests */ = {
+		F2749BD5443C1CB5FE2080C2 /* ChartsTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 06165F3B1D8110E700722320 /* Build configuration list for PBXNativeTarget "ChartsTests" */;
+			buildConfigurationList = E61E9728E2BF9CC4048B13D5 /* Build configuration list for PBXNativeTarget "ChartsTests" */;
 			buildPhases = (
-				064DBAE11D93813D002584CD /* Build Dependencies */,
-				06165F2A1D8110E600722320 /* Sources */,
-				06165F2B1D8110E600722320 /* Frameworks */,
-				06165F2C1D8110E600722320 /* Resources */,
-				B6355D621EA9B71800B74B2E /* Copy Carthage Frameworks */,
+				D6BF00523905132F162A7710 /* Build Dependencies */,
+				E356A2384A2368AB3D2C7912 /* Sources */,
+				5B102E31AA8399941CC6248D /* Resources */,
+				77997192275C47C45A0A2E9A /* Frameworks */,
+				6BA68666BDA3FCF79C2A6801 /* Copy Carthage Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				06165F311D8110E600722320 /* PBXTargetDependency */,
+				8676F8A013D87F9961E92465 /* PBXTargetDependency */,
 			);
 			name = ChartsTests;
 			productName = ChartsTests;
-			productReference = 06165F2E1D8110E600722320 /* ChartsTests.xctest */;
+			productReference = 1CBBC58C6CE1EBEE9852CE41 /* ChartsTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
-		06165F1B1D8110E600722320 /* Project object */ = {
+		193FC8DF32D250560C5F5D77 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastSwiftUpdateCheck = 0830;
+				LastUpgradeCheck = 1020;
 				TargetAttributes = {
-					06165F231D8110E600722320 = {
-						CreatedOnToolsVersion = 7.3.1;
+					A58A4ED274A941CA248EA921 = {
+						LastSwiftMigration = 0900;
 					};
-					06165F2D1D8110E600722320 = {
-						CreatedOnToolsVersion = 7.3.1;
+					F2749BD5443C1CB5FE2080C2 = {
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
-			buildConfigurationList = 06165F1E1D8110E600722320 /* Build configuration list for PBXProject "Charts" */;
+			buildConfigurationList = 493FF4FB1D40FC7C51DDDA6B /* Build configuration list for PBXProject "Charts" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
-			mainGroup = 06165F1A1D8110E600722320;
-			productRefGroup = 06165F251D8110E600722320 /* Products */;
+			mainGroup = 865A1CF149F52850CAB7F177;
+			productRefGroup = AB2D554102718F209377399E /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				06165F231D8110E600722320 /* Charts */,
-				06165F2D1D8110E600722320 /* ChartsTests */,
+				A58A4ED274A941CA248EA921 /* Charts */,
+				F2749BD5443C1CB5FE2080C2 /* ChartsTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		06165F221D8110E600722320 /* Resources */ = {
+		5B102E31AA8399941CC6248D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				00B8BF5901C2D220357B0B2A /* Media.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		06165F2C1D8110E600722320 /* Resources */ = {
+		E257C254E738A8AE047C6FB6 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D8A58A411DCE2EF8007BB012 /* Media.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		064DBAE11D93813D002584CD /* Build Dependencies */ = {
+		6BA68666BDA3FCF79C2A6801 /* Copy Carthage Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				FBSnapshotTestCase.framework,
 			);
-			name = "Build Dependencies";
+			name = "Copy Carthage Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "exec \"${SRCROOT}/scripts/build-dependencies.sh\"\n";
+			shellScript = " exec \"${SRCROOT}/scripts/copy-carthage-frameworks.sh\"";
 		};
-		B6355D621EA9B71800B74B2E /* Copy Carthage Frameworks */ = {
+		D6BF00523905132F162A7710 /* Build Dependencies */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				FBSnapshotTestCase,
-			);
-			name = "Copy Carthage Frameworks";
+			name = "Build Dependencies";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = " exec \"${SRCROOT}/scripts/copy-carthage-frameworks.sh\"";
+			shellScript = "exec \"${SRCROOT}/scripts/build-dependencies.sh\"";
 		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		06165F1F1D8110E600722320 /* Sources */ = {
+		B5996DB2D9B6F0DB0E9D3F3E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				06B120AD1D811B8900D14B02 /* LineScatterCandleRadarRenderer.swift in Sources */,
-				06B120C51D811B8900D14B02 /* TransformerHorizontalBarChart.swift in Sources */,
-				06B1204A1D811B8900D14B02 /* CombinedChartView.swift in Sources */,
-				06B1204C1D811B8900D14B02 /* LineChartView.swift in Sources */,
-				06B120AF1D811B8900D14B02 /* RadarChartRenderer.swift in Sources */,
-				06B1207B1D811B8900D14B02 /* ICandleChartDataSet.swift in Sources */,
-				06B120511D811B8900D14B02 /* AxisBase.swift in Sources */,
-				06B1209F1D811B8900D14B02 /* MoveViewJob.swift in Sources */,
-				06B1209C1D811B8900D14B02 /* AnimatedMoveViewJob.swift in Sources */,
-				06B1208B1D811B8900D14B02 /* ChartHighlighter.swift in Sources */,
-				06B1209A1D811B8900D14B02 /* LineChartDataProvider.swift in Sources */,
-				06B120571D811B8900D14B02 /* MarkerImage.swift in Sources */,
-				06B1207D1D811B8900D14B02 /* ILineChartDataSet.swift in Sources */,
-				06B120801D811B8900D14B02 /* IPieChartDataSet.swift in Sources */,
-				06B120C41D811B8900D14B02 /* Transformer.swift in Sources */,
-				06B1206C1D811B8900D14B02 /* LineChartData.swift in Sources */,
-				06B1208F1D811B8900D14B02 /* IHighlighter.swift in Sources */,
-				5B56A9CD1D905EB300F58178 /* Description.swift in Sources */,
-				06B120921D811B8900D14B02 /* RadarHighlighter.swift in Sources */,
-				06B120771D811B8900D14B02 /* ScatterChartDataSet.swift in Sources */,
-				06B120791D811B8900D14B02 /* IBarLineScatterCandleBubbleChartDataSet.swift in Sources */,
-				06B1205A1D811B8900D14B02 /* YAxis.swift in Sources */,
-				06B120651D811B8900D14B02 /* CandleChartDataEntry.swift in Sources */,
-				06B120911D811B8900D14B02 /* PieRadarHighlighter.swift in Sources */,
-				06B1207A1D811B8900D14B02 /* IBubbleChartDataSet.swift in Sources */,
-				06B120841D811B8900D14B02 /* DefaultAxisValueFormatter.swift in Sources */,
-				06B120711D811B8900D14B02 /* PieChartDataEntry.swift in Sources */,
-				06B120C61D811B8900D14B02 /* ViewPortHandler.swift in Sources */,
-				06B120881D811B8900D14B02 /* IFillFormatter.swift in Sources */,
-				06B1204F1D811B8900D14B02 /* RadarChartView.swift in Sources */,
-				06B120611D811B8900D14B02 /* BubbleChartData.swift in Sources */,
-				06B120441D811B8900D14B02 /* ChartAnimationEasing.swift in Sources */,
-				06B120761D811B8900D14B02 /* ScatterChartData.swift in Sources */,
-				06B120691D811B8900D14B02 /* ChartDataEntryBase.swift in Sources */,
-				06B120891D811B8900D14B02 /* IValueFormatter.swift in Sources */,
-				06B120811D811B8900D14B02 /* IRadarChartDataSet.swift in Sources */,
-				06B120581D811B8900D14B02 /* MarkerView.swift in Sources */,
-				06B120751D811B8900D14B02 /* RadarChartDataSet.swift in Sources */,
-				06B120B11D811B8900D14B02 /* ChevronDownShapeRenderer.swift in Sources */,
-				06B120501D811B8900D14B02 /* ScatterChartView.swift in Sources */,
-				06B120551D811B8900D14B02 /* Legend.swift in Sources */,
-				06B1205F1D811B8900D14B02 /* BarLineScatterCandleBubbleChartData.swift in Sources */,
-				06B120631D811B8900D14B02 /* BubbleChartDataSet.swift in Sources */,
-				06B1205D1D811B8900D14B02 /* BarChartDataEntry.swift in Sources */,
-				06B120481D811B8900D14B02 /* CandleStickChartView.swift in Sources */,
-				06B120B81D811B8900D14B02 /* XShapeRenderer.swift in Sources */,
-				06B120B21D811B8900D14B02 /* ChevronUpShapeRenderer.swift in Sources */,
-				06B120591D811B8900D14B02 /* XAxis.swift in Sources */,
-				06B120681D811B8900D14B02 /* ChartDataEntry.swift in Sources */,
-				06B120A71D811B8900D14B02 /* ChartDataRendererBase.swift in Sources */,
-				06B1209B1D811B8900D14B02 /* ScatterChartDataProvider.swift in Sources */,
-				06B1204D1D811B8900D14B02 /* PieChartView.swift in Sources */,
-				06B120521D811B8900D14B02 /* ChartLimitLine.swift in Sources */,
-				06B120B31D811B8900D14B02 /* CircleShapeRenderer.swift in Sources */,
-				06B1206A1D811B8900D14B02 /* ChartDataSet.swift in Sources */,
-				06B120431D811B8900D14B02 /* Animator.swift in Sources */,
-				06B120B01D811B8900D14B02 /* Renderer.swift in Sources */,
-				06B120851D811B8900D14B02 /* DefaultFillFormatter.swift in Sources */,
-				06B120A91D811B8900D14B02 /* HorizontalBarChartRenderer.swift in Sources */,
-				06B120BB1D811B8900D14B02 /* XAxisRendererHorizontalBarChart.swift in Sources */,
-				06B1205B1D811B8900D14B02 /* ChartBaseDataSet.swift in Sources */,
-				06B120471D811B8900D14B02 /* BubbleChartView.swift in Sources */,
-				06B120BE1D811B8900D14B02 /* YAxisRendererHorizontalBarChart.swift in Sources */,
-				06B120B51D811B8900D14B02 /* IShapeRenderer.swift in Sources */,
-				06B120B71D811B8900D14B02 /* TriangleShapeRenderer.swift in Sources */,
-				06B120971D811B8900D14B02 /* CandleChartDataProvider.swift in Sources */,
-				06B120C11D811B8900D14B02 /* ChartUtils.swift in Sources */,
-				06B120BD1D811B8900D14B02 /* YAxisRenderer.swift in Sources */,
-				06B1206F1D811B8900D14B02 /* LineScatterCandleRadarChartDataSet.swift in Sources */,
-				06B120BC1D811B8900D14B02 /* XAxisRendererRadarChart.swift in Sources */,
-				06B120461D811B8900D14B02 /* BarLineChartViewBase.swift in Sources */,
-				06B120A61D811B8900D14B02 /* CandleStickChartRenderer.swift in Sources */,
-				06B120491D811B8900D14B02 /* ChartViewBase.swift in Sources */,
-				06B120541D811B8900D14B02 /* IMarker.swift in Sources */,
-				06B120BF1D811B8900D14B02 /* YAxisRendererRadarChart.swift in Sources */,
-				06B1207C1D811B8900D14B02 /* IChartDataSet.swift in Sources */,
-				06B120941D811B8900D14B02 /* BarChartDataProvider.swift in Sources */,
-				06B1205E1D811B8900D14B02 /* BarChartDataSet.swift in Sources */,
-				06B120A31D811B8900D14B02 /* BarChartRenderer.swift in Sources */,
-				06B120781D811B8900D14B02 /* IBarChartDataSet.swift in Sources */,
-				06B120601D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataSet.swift in Sources */,
-				06B1208D1D811B8900D14B02 /* Highlight.swift in Sources */,
-				06B120821D811B8900D14B02 /* IScatterChartDataSet.swift in Sources */,
-				06B120951D811B8900D14B02 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */,
-				06B120A81D811B8900D14B02 /* CombinedChartRenderer.swift in Sources */,
-				06B120981D811B8900D14B02 /* ChartDataProvider.swift in Sources */,
-				06B1204B1D811B8900D14B02 /* HorizontalBarChartView.swift in Sources */,
-				06B120871D811B8900D14B02 /* IAxisValueFormatter.swift in Sources */,
-				06B1208A1D811B8900D14B02 /* BarHighlighter.swift in Sources */,
-				06B120A11D811B8900D14B02 /* ZoomViewJob.swift in Sources */,
-				06B120731D811B8900D14B02 /* RadarChartData.swift in Sources */,
-				06B1208C1D811B8900D14B02 /* CombinedHighlighter.swift in Sources */,
-				06B1204E1D811B8900D14B02 /* PieRadarChartViewBase.swift in Sources */,
-				06B120901D811B8900D14B02 /* PieHighlighter.swift in Sources */,
-				06B120AC1D811B8900D14B02 /* LineRadarRenderer.swift in Sources */,
-				06B120561D811B8900D14B02 /* LegendEntry.swift in Sources */,
-				06B120701D811B8900D14B02 /* PieChartData.swift in Sources */,
-				06B120C01D811B8900D14B02 /* ChartColorTemplates.swift in Sources */,
-				06B120B61D811B8900D14B02 /* SquareShapeRenderer.swift in Sources */,
-				06B120661D811B8900D14B02 /* CandleChartDataSet.swift in Sources */,
-				06B120AE1D811B8900D14B02 /* PieChartRenderer.swift in Sources */,
-				06B1207F1D811B8900D14B02 /* ILineScatterCandleRadarChartDataSet.swift in Sources */,
-				06B1209D1D811B8900D14B02 /* AnimatedViewPortJob.swift in Sources */,
-				06B120721D811B8900D14B02 /* PieChartDataSet.swift in Sources */,
-				06B1206B1D811B8900D14B02 /* CombinedChartData.swift in Sources */,
-				5BF8813B1DDC4DF70033370C /* IndexAxisValueFormatter.swift in Sources */,
-				06B120AB1D811B8900D14B02 /* LineChartRenderer.swift in Sources */,
-				06B120C31D811B8900D14B02 /* Platform.swift in Sources */,
-				06B1207E1D811B8900D14B02 /* ILineRadarChartDataSet.swift in Sources */,
-				06B120831D811B8900D14B02 /* DataApproximator.swift in Sources */,
-				06B1206D1D811B8900D14B02 /* LineChartDataSet.swift in Sources */,
-				06B120451D811B8900D14B02 /* BarChartView.swift in Sources */,
-				06B120861D811B8900D14B02 /* DefaultValueFormatter.swift in Sources */,
-				06B120A01D811B8900D14B02 /* ViewPortJob.swift in Sources */,
-				06B120C21D811B8900D14B02 /* Fill.swift in Sources */,
-				06B1205C1D811B8900D14B02 /* BarChartData.swift in Sources */,
-				06B120961D811B8900D14B02 /* BubbleChartDataProvider.swift in Sources */,
-				06B120A51D811B8900D14B02 /* BubbleChartRenderer.swift in Sources */,
-				06B120B91D811B8900D14B02 /* ScatterChartRenderer.swift in Sources */,
-				06B120741D811B8900D14B02 /* RadarChartDataEntry.swift in Sources */,
-				06B120BA1D811B8900D14B02 /* XAxisRenderer.swift in Sources */,
-				06B120641D811B8900D14B02 /* CandleChartData.swift in Sources */,
-				06B120AA1D811B8900D14B02 /* LegendRenderer.swift in Sources */,
-				06B120B41D811B8900D14B02 /* CrossShapeRenderer.swift in Sources */,
-				06B120931D811B8900D14B02 /* Range.swift in Sources */,
-				06B120A21D811B8900D14B02 /* AxisRendererBase.swift in Sources */,
-				06B1208E1D811B8900D14B02 /* HorizontalBarHighlighter.swift in Sources */,
-				06B1206E1D811B8900D14B02 /* LineRadarChartDataSet.swift in Sources */,
-				06B120A41D811B8900D14B02 /* BarLineScatterCandleBubbleRenderer.swift in Sources */,
-				06B120531D811B8900D14B02 /* ComponentBase.swift in Sources */,
-				06B120991D811B8900D14B02 /* CombinedChartDataProvider.swift in Sources */,
-				06B120671D811B8900D14B02 /* ChartData.swift in Sources */,
-				06B1209E1D811B8900D14B02 /* AnimatedZoomViewJob.swift in Sources */,
-				06B120621D811B8900D14B02 /* BubbleChartDataEntry.swift in Sources */,
+				D819331DA581C7E0AC5F8CEF /* Animator.swift in Sources */,
+				F5A209116FAC68F5903D0B46 /* ChartAnimationEasing.swift in Sources */,
+				D29BBEF55C9CC90114919CD2 /* BarChartView.swift in Sources */,
+				9F760570BCECB0BF5727AF90 /* BarLineChartViewBase.swift in Sources */,
+				E4B2F363414E84C4D4B8A885 /* BubbleChartView.swift in Sources */,
+				60EDF735AAB7195DCFA5FE4D /* CandleStickChartView.swift in Sources */,
+				98E2EEF45E8933E4AD182D58 /* ChartViewBase.swift in Sources */,
+				0CAF514A280FF6A14E2A1A23 /* CombinedChartView.swift in Sources */,
+				A692D8BDE42717F69DB790BE /* HorizontalBarChartView.swift in Sources */,
+				7E7561DE19DC7CABBE0B2D3A /* LineChartView.swift in Sources */,
+				2876E17AEB1D92D7BBC4C38A /* PieChartView.swift in Sources */,
+				0A772AEC08246FEC480673E5 /* PieRadarChartViewBase.swift in Sources */,
+				6303DBDEE4FAB8E40D023BCE /* RadarChartView.swift in Sources */,
+				5C457D9A50DA20869AD1739D /* ScatterChartView.swift in Sources */,
+				48E875BBD6540BDE1C1B7D3D /* AxisBase.swift in Sources */,
+				4390D74986A92DEF4F4F2BF0 /* ChartLimitLine.swift in Sources */,
+				FDBDAFA7A5337C6E3992DACE /* ComponentBase.swift in Sources */,
+				DBC9DB402CC9BB84B76968C4 /* Description.swift in Sources */,
+				03960E8148C6AEDACE4B77CC /* IMarker.swift in Sources */,
+				ECE7EAE7179A7F57CE9BBD8F /* Legend.swift in Sources */,
+				C9F3DC272355F791000C3215 /* Platform+Gestures.swift in Sources */,
+				C20A62D8CB9120523D5FB650 /* LegendEntry.swift in Sources */,
+				369DEB23452CB436A3A1A644 /* MarkerImage.swift in Sources */,
+				9360348A04723E653FBC8B18 /* MarkerView.swift in Sources */,
+				78084A4F1D850D5775BC139E /* XAxis.swift in Sources */,
+				2FBA7E982EB57932B9F3E9B5 /* YAxis.swift in Sources */,
+				E50D291A6B6E69BF0B56A67C /* ChartBaseDataSet.swift in Sources */,
+				3395682A1E27756651FF6F4D /* BarChartData.swift in Sources */,
+				45C459FA25DFCBE62FA6A06C /* BarChartDataEntry.swift in Sources */,
+				17E994DA88777AA1D8CCFC58 /* BarChartDataSet.swift in Sources */,
+				C9AA360A2355F01F00C97D93 /* Platform+Color.swift in Sources */,
+				7C9CE6718D18859A35146098 /* BarLineScatterCandleBubbleChartData.swift in Sources */,
+				53A91F6F86740E26FE733639 /* BarLineScatterCandleBubbleChartDataSet.swift in Sources */,
+				E68CA3DC66EB638C956E09B8 /* BubbleChartData.swift in Sources */,
+				C09E91F67A4AC43C277E7D82 /* BubbleChartDataEntry.swift in Sources */,
+				63C0A21D145BFEDED5406E4D /* BubbleChartDataSet.swift in Sources */,
+				DDE704689FDF2C0E0338488B /* CandleChartData.swift in Sources */,
+				D50B0EC2BB2245F32E757C50 /* CandleChartDataEntry.swift in Sources */,
+				383D68A13E1C3D6A251E5147 /* CandleChartDataSet.swift in Sources */,
+				81892994002C0640AD858748 /* ChartData.swift in Sources */,
+				EAEA60D22CA8C1B7E18D3F7D /* ChartDataEntry.swift in Sources */,
+				7D546013F3A14FF5BB7F3294 /* ChartDataEntryBase.swift in Sources */,
+				66A18A8EEBAAAC2EDA31ABEC /* ChartDataSet.swift in Sources */,
+				331AA2C4BC34F56C23012F02 /* CombinedChartData.swift in Sources */,
+				C04D269AD4A373FD2B621C43 /* LineChartData.swift in Sources */,
+				95B6D6F35684292A62DBEA74 /* LineChartDataSet.swift in Sources */,
+				7CB7F74752619B0270CCB0A9 /* LineRadarChartDataSet.swift in Sources */,
+				FA07D034D9C3BC7795184ACA /* LineScatterCandleRadarChartDataSet.swift in Sources */,
+				2C879FC24D7A15D70BE4063F /* PieChartData.swift in Sources */,
+				23649EFC635A76022F07FFA6 /* PieChartDataEntry.swift in Sources */,
+				B539114951455C35BADAE3F3 /* PieChartDataSet.swift in Sources */,
+				0C52C70C6E6EA09BD7426386 /* RadarChartData.swift in Sources */,
+				C2EFB4EC8C97FA9987F1B50D /* RadarChartDataEntry.swift in Sources */,
+				E3B28EA1E21279DF3889BCE8 /* RadarChartDataSet.swift in Sources */,
+				9A26C8DB1F87B01700367599 /* DataApproximator+N.swift in Sources */,
+				2B791E64E7C4523B1A63F72A /* ScatterChartData.swift in Sources */,
+				EB56849433A76B08606B73EB /* ScatterChartDataSet.swift in Sources */,
+				C3F0DDB7F0A922F0BB7EDB8A /* IBarChartDataSet.swift in Sources */,
+				AF4AAF3709ED9DDF6362EAE8 /* IBarLineScatterCandleBubbleChartDataSet.swift in Sources */,
+				2C40CFFC8D88BEA70E0A50B0 /* IBubbleChartDataSet.swift in Sources */,
+				0D8A89398F9BD5DCC8D7F976 /* ICandleChartDataSet.swift in Sources */,
+				E8F0F4F47CD7D72B4EE5A794 /* IChartDataSet.swift in Sources */,
+				F941C88BF814DF51C465CB95 /* ILineChartDataSet.swift in Sources */,
+				1311BEC21E9CC264E971EFAF /* ILineRadarChartDataSet.swift in Sources */,
+				146EE16342C2BADC92E45BF2 /* ILineScatterCandleRadarChartDataSet.swift in Sources */,
+				FAAD9FF6565DED2652188584 /* IPieChartDataSet.swift in Sources */,
+				83BBAF3EDC31FD452F8BF1DB /* IRadarChartDataSet.swift in Sources */,
+				50476F8E6662CAFC1EFE0723 /* IScatterChartDataSet.swift in Sources */,
+				97E033CC0ABEF0F448DAFA8E /* DataApproximator.swift in Sources */,
+				779B46E9F13A087BFA47D539 /* DefaultAxisValueFormatter.swift in Sources */,
+				F744C510DA9B85C228BBB335 /* DefaultFillFormatter.swift in Sources */,
+				B0D28C68BB9A958DC56EB214 /* DefaultValueFormatter.swift in Sources */,
+				B13C74B4FF705D7B595D01EF /* IAxisValueFormatter.swift in Sources */,
+				B6C9F450D937B87224D29D5C /* IFillFormatter.swift in Sources */,
+				967EE2EDDE3337C5C4337C59 /* IndexAxisValueFormatter.swift in Sources */,
+				A40ACF0CCE96EEE104B0463D /* IValueFormatter.swift in Sources */,
+				C9F3DC262355F791000C3215 /* Platform+Graphics.swift in Sources */,
+				3CBE95F1E9394FA08CDCF31E /* BarHighlighter.swift in Sources */,
+				D326491E8BCDE54A0921E137 /* ChartHighlighter.swift in Sources */,
+				64FA1EDB4DC1F65727D52D10 /* CombinedHighlighter.swift in Sources */,
+				758EB1C75063ED3373542F3B /* Highlight.swift in Sources */,
+				4E98788ABEF6496C23F3E6C6 /* HorizontalBarHighlighter.swift in Sources */,
+				203A39685CC96FC625F616E4 /* IHighlighter.swift in Sources */,
+				73EDF662AD989E930D365B72 /* PieHighlighter.swift in Sources */,
+				3097296AC7FFA994FE4AD312 /* PieRadarHighlighter.swift in Sources */,
+				C33E1AF5471A60BA42DAF52E /* RadarHighlighter.swift in Sources */,
+				9C91C151608E2D6E19B1EAD1 /* Range.swift in Sources */,
+				00BC23EF0E04E17188344403 /* BarChartDataProvider.swift in Sources */,
+				28FEE609C5B22FD64C7E5D10 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */,
+				4272DA5D44AF7DA05A5A8287 /* BubbleChartDataProvider.swift in Sources */,
+				30DCC4BAA5601B154ABADA13 /* CandleChartDataProvider.swift in Sources */,
+				FD37AAC0270F390FFC470A65 /* ChartDataProvider.swift in Sources */,
+				C9F3DC292355FA2F000C3215 /* Platform+Touch Handling.swift in Sources */,
+				65EA404AE098EBCE8D5DE04B /* CombinedChartDataProvider.swift in Sources */,
+				2BA03CEC36BADCF682F1328B /* LineChartDataProvider.swift in Sources */,
+				0511E43EF3FD2CDE7F7F15DB /* ScatterChartDataProvider.swift in Sources */,
+				7EE6EFE70CF4D8B09CAFCD01 /* AnimatedMoveViewJob.swift in Sources */,
+				CC7F8198A13249B5DEBBF25E /* AnimatedViewPortJob.swift in Sources */,
+				0577C2B38BCE4C871F262714 /* AnimatedZoomViewJob.swift in Sources */,
+				02A6E6E1A82A27A66B8D08C4 /* MoveViewJob.swift in Sources */,
+				9400725714D0DA707DDECD2E /* ViewPortJob.swift in Sources */,
+				AEE9C4E4AC02B8FB3CD21975 /* ZoomViewJob.swift in Sources */,
+				ECECC58CEF03B1718F8267E8 /* AxisRendererBase.swift in Sources */,
+				23FA50B2730D8C7ACA091C4F /* BarChartRenderer.swift in Sources */,
+				219192CA6B4895319AB49DCA /* BarLineScatterCandleBubbleRenderer.swift in Sources */,
+				56E0F5EA9255B9B92876E040 /* BubbleChartRenderer.swift in Sources */,
+				8BCCD709AACC565613D9DA68 /* CandleStickChartRenderer.swift in Sources */,
+				F37B07008B8AE7F3909FFB9C /* ChartDataRendererBase.swift in Sources */,
+				05253AFC448C107DEF54C2FE /* CombinedChartRenderer.swift in Sources */,
+				F100D68395F169B93590FA96 /* HorizontalBarChartRenderer.swift in Sources */,
+				2B821AAC3EBD60A73EACBCE6 /* LegendRenderer.swift in Sources */,
+				5F96E95C7073D21EFE02BCF7 /* LineChartRenderer.swift in Sources */,
+				24151B0729D77251A8494D70 /* LineRadarRenderer.swift in Sources */,
+				B6DCC229615EFE706F64A37D /* LineScatterCandleRadarRenderer.swift in Sources */,
+				795E100895C24049509F1EDE /* PieChartRenderer.swift in Sources */,
+				97AD2D4620AF917100F9C24A /* Platform+Accessibility.swift in Sources */,
+				69EA073EDF75D49ABE1715D6 /* RadarChartRenderer.swift in Sources */,
+				CEF68F42A5390A73113F3663 /* Renderer.swift in Sources */,
+				796D3E63A37A95FD9D1AB9A1 /* ChevronDownShapeRenderer.swift in Sources */,
+				F103D90FC5DEEA0D7BB4407E /* ChevronUpShapeRenderer.swift in Sources */,
+				B85DEB06B4C1AFFC8A0E3295 /* CircleShapeRenderer.swift in Sources */,
+				0529DD51622C8769C1121F90 /* CrossShapeRenderer.swift in Sources */,
+				8A9FF54E2075A9047CC8E953 /* IShapeRenderer.swift in Sources */,
+				8EF7B3FBE37F72CC030CD865 /* SquareShapeRenderer.swift in Sources */,
+				8F4B1A9060472764073DFA0B /* TriangleShapeRenderer.swift in Sources */,
+				93A94E1FF55041A6032891FE /* XShapeRenderer.swift in Sources */,
+				5DC9BC1B6C128B2C9995AB84 /* ScatterChartRenderer.swift in Sources */,
+				41BEBF8BDB9DC403B5697D67 /* XAxisRenderer.swift in Sources */,
+				2A94F1724FEA9E16A81A8E1F /* XAxisRendererHorizontalBarChart.swift in Sources */,
+				4FACC6FD308AFB231EB4A93D /* XAxisRendererRadarChart.swift in Sources */,
+				41B13F3179ACB5A3837C6E55 /* YAxisRenderer.swift in Sources */,
+				846AC09831FA93F66732591B /* YAxisRendererHorizontalBarChart.swift in Sources */,
+				11F68AA2EBF822D7208EE002 /* YAxisRendererRadarChart.swift in Sources */,
+				40C82F2209E1BA9E41E8F3DA /* ChartColorTemplates.swift in Sources */,
+				CB785FE9B6B312408D17BC3B /* ChartUtils.swift in Sources */,
+				8102A555DD6C93AC1290EA7C /* Fill.swift in Sources */,
+				E9FF0ECB5E0CA92DBF4C1BC4 /* Platform.swift in Sources */,
+				DE0F434FE8C24C52B023370F /* Transformer.swift in Sources */,
+				8A463E2947F211C594CA5E95 /* TransformerHorizontalBarChart.swift in Sources */,
+				515E286E6C47594D3FFA3DD1 /* ViewPortHandler.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		06165F2A1D8110E600722320 /* Sources */ = {
+		E356A2384A2368AB3D2C7912 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				06B3C0F81D99F85400B1DF43 /* LineChartTests.swift in Sources */,
-				06B3C0F71D99F85400B1DF43 /* BarChartTests.swift in Sources */,
-				06761B5E1D98176000D5CE09 /* ChartUtilsTests.swift in Sources */,
+				3B11556EB7DC034E2FC958E4 /* BarChartTests.swift in Sources */,
+				8E1192F7A7152E9DA92C56A9 /* ChartUtilsTests.swift in Sources */,
+				B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */,
+				2BF85BEA981B359A65E9BF67 /* LineChartTests.swift in Sources */,
+				B66817462241E3CC00017CF1 /* HorizontalBarChartTests.swift in Sources */,
+				135F11CE20425AF600D655A3 /* PieChartTests.swift in Sources */,
+				064989461F5C99C7006E8BB3 /* Snapshot.swift in Sources */,
+				C03E6D8123DAAB2600083010 /* ChartDataTests.swift in Sources */,
+				224EFF991FBAAC4700CF9B3B /* EquatableTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		06165F311D8110E600722320 /* PBXTargetDependency */ = {
+		8676F8A013D87F9961E92465 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 06165F231D8110E600722320 /* Charts */;
-			targetProxy = 06165F301D8110E600722320 /* PBXContainerItemProxy */;
+			name = Charts;
+			target = A58A4ED274A941CA248EA921 /* Charts */;
+			targetProxy = C2005F425A98942473657ED2 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		06165F361D8110E700722320 /* Debug */ = {
+		0EF2164C35AB4D391B503317 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				FRAMEWORK_VERSION = A;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 3.4.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.Charts;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		4DD0BFDA94D4BC68192A1895 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
+					"$(SRCROOT)/Carthage/Build/tvOS/",
+					"$(inherited)",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
+					"$(SRCROOT)/Carthage/Build/iOS/",
+					"$(inherited)",
+				);
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+			};
+			name = Debug;
+		};
+		A17F60813C38081A2F1803D4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
+				CODE_SIGN_IDENTITY = "";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos macosx";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				VALIDATE_PRODUCT = YES;
 			};
-			name = Debug;
+			name = Release;
 		};
-		06165F371D8110E700722320 /* Release */ = {
+		C5C79E736CA16C93F421E934 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos macosx";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
-			};
-			name = Release;
-		};
-		06165F391D8110E700722320 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Source/Supporting Files/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.Charts;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
 			};
 			name = Debug;
 		};
-		06165F3A1D8110E700722320 /* Release */ = {
+		D9365FBCFFEE9FCFC79EC4C7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/Source/Supporting Files/Info.plist";
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MARKETING_VERSION = 3.4.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.Charts;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		06165F3C1D8110E700722320 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 063FF0401D8CC9940094A042 /* Carthage.xcconfig */;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "$(SRCROOT)/Tests/Supporting Files/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-			};
-			name = Debug;
-		};
-		06165F3D1D8110E700722320 /* Release */ = {
+		FA978B0A385680C0086D4D49 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 063FF0401D8CC9940094A042 /* Carthage.xcconfig */;
 			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "$(SRCROOT)/Tests/Supporting Files/Info.plist";
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
+					"$(SRCROOT)/Carthage/Build/tvOS/",
+					"$(inherited)",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
+					"$(SRCROOT)/Carthage/Build/iOS/",
+					"$(inherited)",
+				);
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		06165F1E1D8110E600722320 /* Build configuration list for PBXProject "Charts" */ = {
+		493FF4FB1D40FC7C51DDDA6B /* Build configuration list for PBXProject "Charts" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				06165F361D8110E700722320 /* Debug */,
-				06165F371D8110E700722320 /* Release */,
+				C5C79E736CA16C93F421E934 /* Debug */,
+				A17F60813C38081A2F1803D4 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		06165F381D8110E700722320 /* Build configuration list for PBXNativeTarget "Charts" */ = {
+		E61E9728E2BF9CC4048B13D5 /* Build configuration list for PBXNativeTarget "ChartsTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				06165F391D8110E700722320 /* Debug */,
-				06165F3A1D8110E700722320 /* Release */,
+				FA978B0A385680C0086D4D49 /* Release */,
+				4DD0BFDA94D4BC68192A1895 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		06165F3B1D8110E700722320 /* Build configuration list for PBXNativeTarget "ChartsTests" */ = {
+		F1D4AA9E26EA32041FC0E3B6 /* Build configuration list for PBXNativeTarget "Charts" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				06165F3C1D8110E700722320 /* Debug */,
-				06165F3D1D8110E700722320 /* Release */,
+				D9365FBCFFEE9FCFC79EC4C7 /* Release */,
+				0EF2164C35AB4D391B503317 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
-	rootObject = 06165F1B1D8110E600722320 /* Project object */;
+	rootObject = 193FC8DF32D250560C5F5D77 /* Project object */;
 }
diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
index 4002aea0ad..2adbb36e05 100644
--- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
+++ b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F231D8110E600722320"
+               BlueprintIdentifier = "A58A4ED274A941CA248EA921"
                BuildableName = "Charts.framework"
                BlueprintName = "Charts"
                ReferencedContainer = "container:Charts.xcodeproj">
@@ -26,31 +26,19 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
                BuildableName = "ChartsTests.xctest"
                BlueprintName = "ChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -65,7 +53,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
+            BlueprintIdentifier = "A58A4ED274A941CA248EA921"
             BuildableName = "Charts.framework"
             BlueprintName = "Charts"
             ReferencedContainer = "container:Charts.xcodeproj">
@@ -78,8 +66,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -87,15 +73,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme
index 1e75bd68d3..b82759f6e6 100644
--- a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme
+++ b/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -9,12 +9,12 @@
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
                BuildableName = "ChartsTests.xctest"
                BlueprintName = "ChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
@@ -33,15 +33,13 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
                BuildableName = "ChartsTests.xctest"
                BlueprintName = "ChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -56,7 +54,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F2D1D8110E600722320"
+            BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
             BuildableName = "ChartsTests.xctest"
             BlueprintName = "ChartsTests"
             ReferencedContainer = "container:Charts.xcodeproj">
@@ -69,8 +67,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -78,15 +74,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F2D1D8110E600722320"
-            BuildableName = "ChartsTests.xctest"
-            BlueprintName = "ChartsTests"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Charts.xcworkspace/contents.xcworkspacedata b/Charts.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..088d4b7329
--- /dev/null
+++ b/Charts.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "container:Charts.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000000..18d981003d
--- /dev/null
+++ b/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj
similarity index 60%
rename from ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj
rename to ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj
index aa78a57d11..8437b66ad1 100644
--- a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj
+++ b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj
@@ -11,24 +11,76 @@
 		0471CBFC1CA1090A00E52DBC /* PiePolylineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */; };
 		0630AE511D81271B008859B0 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; };
 		0630AE521D81271B008859B0 /* Charts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		068A9B191FBBF351003CF1AD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF2F1AB32E15009697AA /* Images.xcassets */; };
+		068A9B1A1FBBF355003CF1AD /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B64D06EA1FB199130067418D /* Launch Screen.storyboard */; };
+		068A9B1B1FBBF366003CF1AD /* radar_marker@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B613DA31D526AD5000F1E98 /* radar_marker@3x.png */; };
+		225B36201F6EB9A50005B3D5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B361F1F6EB9A50005B3D5 /* AppDelegate.swift */; };
+		225B36311F6EB9EE0005B3D5 /* DemoBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B362F1F6EB9EE0005B3D5 /* DemoBaseViewController.swift */; };
+		225B36321F6EB9EE0005B3D5 /* DemoListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36301F6EB9EE0005B3D5 /* DemoListViewController.swift */; };
+		225B36381F6EBA040005B3D5 /* IntAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36341F6EB9FE0005B3D5 /* IntAxisValueFormatter.swift */; };
+		225B36391F6EBA040005B3D5 /* DayAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36351F6EB9FE0005B3D5 /* DayAxisValueFormatter.swift */; };
+		225B363A1F6EBA040005B3D5 /* DateValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36361F6EB9FE0005B3D5 /* DateValueFormatter.swift */; };
+		225B363B1F6EBA040005B3D5 /* LargeValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36371F6EB9FE0005B3D5 /* LargeValueFormatter.swift */; };
+		225B36401F6EBA1D0005B3D5 /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B363D1F6EBA180005B3D5 /* XYMarkerView.swift */; };
+		225B36421F6EBA1D0005B3D5 /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B363F1F6EBA180005B3D5 /* RadarMarkerView.swift */; };
+		225B365B1F6EBA470005B3D5 /* MultipleLinesChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36441F6EBA410005B3D5 /* MultipleLinesChartViewController.swift */; };
+		225B365C1F6EBA470005B3D5 /* MultipleBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36451F6EBA410005B3D5 /* MultipleBarChartViewController.swift */; };
+		225B365D1F6EBA470005B3D5 /* HalfPieChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36461F6EBA410005B3D5 /* HalfPieChartViewController.swift */; };
+		225B365E1F6EBA470005B3D5 /* LineChartTimeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36471F6EBA410005B3D5 /* LineChartTimeViewController.swift */; };
+		225B365F1F6EBA470005B3D5 /* ColoredLineChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36481F6EBA410005B3D5 /* ColoredLineChartViewController.swift */; };
+		225B36601F6EBA470005B3D5 /* LineChart2ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36491F6EBA410005B3D5 /* LineChart2ViewController.swift */; };
+		225B36611F6EBA470005B3D5 /* LineChart1ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B364A1F6EBA410005B3D5 /* LineChart1ViewController.swift */; };
+		225B36621F6EBA470005B3D5 /* NegativeStackedBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B364B1F6EBA410005B3D5 /* NegativeStackedBarChartViewController.swift */; };
+		225B36631F6EBA470005B3D5 /* ScatterChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B364C1F6EBA410005B3D5 /* ScatterChartViewController.swift */; };
+		225B36641F6EBA470005B3D5 /* StackedBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B364D1F6EBA410005B3D5 /* StackedBarChartViewController.swift */; };
+		225B36651F6EBA470005B3D5 /* BubbleChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B364E1F6EBA410005B3D5 /* BubbleChartViewController.swift */; };
+		225B36661F6EBA470005B3D5 /* LineChartFilledViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B364F1F6EBA410005B3D5 /* LineChartFilledViewController.swift */; };
+		225B36671F6EBA470005B3D5 /* PositiveNegativeBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36501F6EBA410005B3D5 /* PositiveNegativeBarChartViewController.swift */; };
+		225B36681F6EBA470005B3D5 /* AnotherBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36511F6EBA410005B3D5 /* AnotherBarChartViewController.swift */; };
+		225B36691F6EBA470005B3D5 /* PieChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36521F6EBA410005B3D5 /* PieChartViewController.swift */; };
+		225B366A1F6EBA470005B3D5 /* CubicLineChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36531F6EBA410005B3D5 /* CubicLineChartViewController.swift */; };
+		225B366B1F6EBA470005B3D5 /* RadarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36541F6EBA410005B3D5 /* RadarChartViewController.swift */; };
+		225B366C1F6EBA470005B3D5 /* HorizontalBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36551F6EBA410005B3D5 /* HorizontalBarChartViewController.swift */; };
+		225B366D1F6EBA470005B3D5 /* PiePolylineChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36561F6EBA410005B3D5 /* PiePolylineChartViewController.swift */; };
+		225B366E1F6EBA470005B3D5 /* CombinedChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36571F6EBA410005B3D5 /* CombinedChartViewController.swift */; };
+		225B366F1F6EBA470005B3D5 /* BarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36581F6EBA410005B3D5 /* BarChartViewController.swift */; };
+		225B36701F6EBA470005B3D5 /* SinusBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36591F6EBA410005B3D5 /* SinusBarChartViewController.swift */; };
+		225B36711F6EBA470005B3D5 /* CandleStickChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B365A1F6EBA410005B3D5 /* CandleStickChartViewController.swift */; };
+		225B36721F6EBA5E0005B3D5 /* DemoListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF231AB3271B009697AA /* DemoListViewController.xib */; };
+		225B36731F6EBA5E0005B3D5 /* RadarMarkerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B613DB41D526EA8000F1E98 /* RadarMarkerView.xib */; };
+		225B36741F6EBA640005B3D5 /* AnotherBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED111ABBFB2B0013F194 /* AnotherBarChartViewController.xib */; };
+		225B36751F6EBA640005B3D5 /* BarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BD47E641ABB424E008FCEC6 /* BarChartViewController.xib */; };
+		225B36761F6EBA640005B3D5 /* BubbleChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55E3564D1ADC638F00A57971 /* BubbleChartViewController.xib */; };
+		225B36771F6EBA640005B3D5 /* CandleStickChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED2B1ABC160F0013F194 /* CandleStickChartViewController.xib */; };
+		225B36781F6EBA640005B3D5 /* ColoredLineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3A1ABC199F0013F194 /* ColoredLineChartViewController.xib */; };
+		225B36791F6EBA640005B3D5 /* CombinedChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BDEDC461ABB871E007D3A60 /* CombinedChartViewController.xib */; };
+		225B367A1F6EBA640005B3D5 /* CubicLineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED301ABC18F00013F194 /* CubicLineChartViewController.xib */; };
+		225B367B1F6EBA640005B3D5 /* HalfPieChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BE6737F1D5B496500A87BA2 /* HalfPieChartViewController.xib */; };
+		225B367C1F6EBA640005B3D5 /* HorizontalBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BDEDC401ABB7F73007D3A60 /* HorizontalBarChartViewController.xib */; };
+		225B367D1F6EBA640005B3D5 /* LineChart1ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BD8F0731AB89CE500566E05 /* LineChart1ViewController.xib */; };
+		225B367E1F6EBA640005B3D5 /* LineChart2ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */; };
+		225B367F1F6EBA640005B3D5 /* LineChartFilledViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BE6738E1D5B4E0900A87BA2 /* LineChartFilledViewController.xib */; };
+		225B36801F6EBA640005B3D5 /* LineChartTimeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BE673911D5B4E0900A87BA2 /* LineChartTimeViewController.xib */; };
+		225B36811F6EBA640005B3D5 /* MultipleBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED211ABC0BE20013F194 /* MultipleBarChartViewController.xib */; };
+		225B36821F6EBA640005B3D5 /* MultipleLinesChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED241ABC0BE20013F194 /* MultipleLinesChartViewController.xib */; };
+		225B36831F6EBA640005B3D5 /* NegativeStackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */; };
+		225B36841F6EBA640005B3D5 /* PieChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B0CC7841ABB875400665592 /* PieChartViewController.xib */; };
+		225B36851F6EBA640005B3D5 /* PiePolylineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */; };
+		225B36861F6EBA640005B3D5 /* PositiveNegativeBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BE7E7611C693098000A0377 /* PositiveNegativeBarChartViewController.xib */; };
+		225B36871F6EBA640005B3D5 /* RadarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED351ABC192F0013F194 /* RadarChartViewController.xib */; };
+		225B36881F6EBA640005B3D5 /* RealmDemosViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */; };
+		225B36891F6EBA640005B3D5 /* ScatterChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED171ABBFB340013F194 /* ScatterChartViewController.xib */; };
+		225B368A1F6EBA640005B3D5 /* SinusBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */; };
+		225B368B1F6EBA640005B3D5 /* StackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED1A1ABBFB340013F194 /* StackedBarChartViewController.xib */; };
+		225B368C1F6EBBB00005B3D5 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; };
+		225B368D1F6EBBB00005B3D5 /* Charts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		55E356501ADC638F00A57971 /* BubbleChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55E3564D1ADC638F00A57971 /* BubbleChartViewController.xib */; };
 		55E356511ADC638F00A57971 /* BubbleChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E3564F1ADC638F00A57971 /* BubbleChartViewController.m */; };
 		5B0CC7851ABB875400665592 /* PieChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B0CC7831ABB875400665592 /* PieChartViewController.m */; };
 		5B0CC7861ABB875400665592 /* PieChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B0CC7841ABB875400665592 /* PieChartViewController.xib */; };
-		5B1B5DAA1E911A15006D1375 /* RealmDemosViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B1B5DA81E911A15006D1375 /* RealmDemosViewController.m */; };
 		5B1B5DAB1E911A15006D1375 /* RealmDemosViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */; };
-		5B4316271AB8D8AE0009FCAA /* Icon-29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B43161F1AB8D8AE0009FCAA /* Icon-29@2x.png */; };
-		5B4316281AB8D8AE0009FCAA /* Icon-29@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316201AB8D8AE0009FCAA /* Icon-29@3x.png */; };
-		5B4316291AB8D8AE0009FCAA /* Icon-40@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316211AB8D8AE0009FCAA /* Icon-40@2x.png */; };
-		5B43162A1AB8D8AE0009FCAA /* Icon-40@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316221AB8D8AE0009FCAA /* Icon-40@3x.png */; };
-		5B43162B1AB8D8AE0009FCAA /* Icon-60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316231AB8D8AE0009FCAA /* Icon-60@2x.png */; };
-		5B43162C1AB8D8AE0009FCAA /* Icon-60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316241AB8D8AE0009FCAA /* Icon-60@3x.png */; };
-		5B43162D1AB8D8AE0009FCAA /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316251AB8D8AE0009FCAA /* iTunesArtwork */; };
-		5B43162E1AB8D8AE0009FCAA /* iTunesArtwork@2x in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316261AB8D8AE0009FCAA /* iTunesArtwork@2x */; };
-		5B4316351AB8D8B70009FCAA /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316311AB8D8B70009FCAA /* Default-568h@2x.png */; };
-		5B4316361AB8D8B70009FCAA /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316321AB8D8B70009FCAA /* Default-667h@2x.png */; };
-		5B4316371AB8D8B70009FCAA /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316331AB8D8B70009FCAA /* Default-736h@3x.png */; };
-		5B4316381AB8D8B70009FCAA /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316341AB8D8B70009FCAA /* Default@2x.png */; };
+		5B442CD223D9B0A300B1F801 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
+		5B442CD323D9B0AB00B1F801 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
 		5B57BBB51A9B26AA0036A6CC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB41A9B26AA0036A6CC /* main.m */; };
 		5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB71A9B26AA0036A6CC /* AppDelegate.m */; };
 		5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */; };
@@ -42,7 +94,6 @@
 		5B8EAF301AB32E15009697AA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF2F1AB32E15009697AA /* Images.xcassets */; };
 		5B9624411B38608C007763E2 /* NegativeStackedBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */; };
 		5B9624421B38608C007763E2 /* NegativeStackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */; };
-		5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
 		5BD47E601ABB3C91008FCEC6 /* LineChart2ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */; };
 		5BD47E611ABB3C91008FCEC6 /* LineChart2ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */; };
 		5BD47E651ABB424E008FCEC6 /* BarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E631ABB424E008FCEC6 /* BarChartViewController.m */; };
@@ -84,6 +135,7 @@
 		5BEAED3C1ABC199F0013F194 /* ColoredLineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3A1ABC199F0013F194 /* ColoredLineChartViewController.xib */; };
 		5BEAED401ABC1AC60013F194 /* SinusBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BEAED3E1ABC1AC60013F194 /* SinusBarChartViewController.m */; };
 		5BEAED411ABC1AC60013F194 /* SinusBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */; };
+		B64D06EB1FB199130067418D /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B64D06EA1FB199130067418D /* Launch Screen.storyboard */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -105,12 +157,30 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE391D8126C0008859B0 /* Charts.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 06165F231D8110E600722320;
+			remoteGlobalIDString = A58A4ED274A941CA248EA921;
+			remoteInfo = Charts;
+		};
+		225B368E1F6EBBB00005B3D5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0630AE391D8126C0008859B0 /* Charts.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = A58A4ED274A941CA248EA921;
 			remoteInfo = Charts;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		225B36901F6EBBB10005B3D5 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				225B368D1F6EBBB00005B3D5 /* Charts.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		5BB4B0751ACA710D00E2EF4D /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -129,29 +199,47 @@
 		0439A3521C9FF95F00496F83 /* PiePolylineChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PiePolylineChartViewController.m; sourceTree = "<group>"; };
 		0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PiePolylineChartViewController.xib; sourceTree = "<group>"; };
 		0630AE391D8126C0008859B0 /* Charts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Charts.xcodeproj; path = ../Charts.xcodeproj; sourceTree = "<group>"; };
-		066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Carthage.xcconfig; path = ../Carthage.xcconfig; sourceTree = "<group>"; };
+		225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-iOS-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		225B361F1F6EB9A50005B3D5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		225B362F1F6EB9EE0005B3D5 /* DemoBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoBaseViewController.swift; sourceTree = "<group>"; };
+		225B36301F6EB9EE0005B3D5 /* DemoListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoListViewController.swift; sourceTree = "<group>"; };
+		225B36341F6EB9FE0005B3D5 /* IntAxisValueFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntAxisValueFormatter.swift; sourceTree = "<group>"; };
+		225B36351F6EB9FE0005B3D5 /* DayAxisValueFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayAxisValueFormatter.swift; sourceTree = "<group>"; };
+		225B36361F6EB9FE0005B3D5 /* DateValueFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateValueFormatter.swift; sourceTree = "<group>"; };
+		225B36371F6EB9FE0005B3D5 /* LargeValueFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeValueFormatter.swift; sourceTree = "<group>"; };
+		225B363D1F6EBA180005B3D5 /* XYMarkerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XYMarkerView.swift; sourceTree = "<group>"; };
+		225B363F1F6EBA180005B3D5 /* RadarMarkerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarMarkerView.swift; sourceTree = "<group>"; };
+		225B36441F6EBA410005B3D5 /* MultipleLinesChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipleLinesChartViewController.swift; sourceTree = "<group>"; };
+		225B36451F6EBA410005B3D5 /* MultipleBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipleBarChartViewController.swift; sourceTree = "<group>"; };
+		225B36461F6EBA410005B3D5 /* HalfPieChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HalfPieChartViewController.swift; sourceTree = "<group>"; };
+		225B36471F6EBA410005B3D5 /* LineChartTimeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChartTimeViewController.swift; sourceTree = "<group>"; };
+		225B36481F6EBA410005B3D5 /* ColoredLineChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredLineChartViewController.swift; sourceTree = "<group>"; };
+		225B36491F6EBA410005B3D5 /* LineChart2ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChart2ViewController.swift; sourceTree = "<group>"; };
+		225B364A1F6EBA410005B3D5 /* LineChart1ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChart1ViewController.swift; sourceTree = "<group>"; };
+		225B364B1F6EBA410005B3D5 /* NegativeStackedBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NegativeStackedBarChartViewController.swift; sourceTree = "<group>"; };
+		225B364C1F6EBA410005B3D5 /* ScatterChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScatterChartViewController.swift; sourceTree = "<group>"; };
+		225B364D1F6EBA410005B3D5 /* StackedBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackedBarChartViewController.swift; sourceTree = "<group>"; };
+		225B364E1F6EBA410005B3D5 /* BubbleChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BubbleChartViewController.swift; sourceTree = "<group>"; };
+		225B364F1F6EBA410005B3D5 /* LineChartFilledViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChartFilledViewController.swift; sourceTree = "<group>"; };
+		225B36501F6EBA410005B3D5 /* PositiveNegativeBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PositiveNegativeBarChartViewController.swift; sourceTree = "<group>"; };
+		225B36511F6EBA410005B3D5 /* AnotherBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnotherBarChartViewController.swift; sourceTree = "<group>"; };
+		225B36521F6EBA410005B3D5 /* PieChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PieChartViewController.swift; sourceTree = "<group>"; };
+		225B36531F6EBA410005B3D5 /* CubicLineChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CubicLineChartViewController.swift; sourceTree = "<group>"; };
+		225B36541F6EBA410005B3D5 /* RadarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarChartViewController.swift; sourceTree = "<group>"; };
+		225B36551F6EBA410005B3D5 /* HorizontalBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HorizontalBarChartViewController.swift; sourceTree = "<group>"; };
+		225B36561F6EBA410005B3D5 /* PiePolylineChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PiePolylineChartViewController.swift; sourceTree = "<group>"; };
+		225B36571F6EBA410005B3D5 /* CombinedChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombinedChartViewController.swift; sourceTree = "<group>"; };
+		225B36581F6EBA410005B3D5 /* BarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarChartViewController.swift; sourceTree = "<group>"; };
+		225B36591F6EBA410005B3D5 /* SinusBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SinusBarChartViewController.swift; sourceTree = "<group>"; };
+		225B365A1F6EBA410005B3D5 /* CandleStickChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CandleStickChartViewController.swift; sourceTree = "<group>"; };
 		55E3564D1ADC638F00A57971 /* BubbleChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BubbleChartViewController.xib; sourceTree = "<group>"; };
 		55E3564E1ADC638F00A57971 /* BubbleChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BubbleChartViewController.h; sourceTree = "<group>"; };
 		55E3564F1ADC638F00A57971 /* BubbleChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BubbleChartViewController.m; sourceTree = "<group>"; };
 		5B0CC7821ABB875400665592 /* PieChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PieChartViewController.h; sourceTree = "<group>"; };
 		5B0CC7831ABB875400665592 /* PieChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PieChartViewController.m; sourceTree = "<group>"; };
 		5B0CC7841ABB875400665592 /* PieChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PieChartViewController.xib; sourceTree = "<group>"; };
-		5B1B5DA71E911A15006D1375 /* RealmDemosViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RealmDemosViewController.h; path = Classes/RealmDemosViewController.h; sourceTree = SOURCE_ROOT; };
-		5B1B5DA81E911A15006D1375 /* RealmDemosViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RealmDemosViewController.m; path = Classes/RealmDemosViewController.m; sourceTree = SOURCE_ROOT; };
-		5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RealmDemosViewController.xib; path = Classes/RealmDemosViewController.xib; sourceTree = SOURCE_ROOT; };
-		5B43161F1AB8D8AE0009FCAA /* Icon-29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-29@2x.png"; sourceTree = "<group>"; };
-		5B4316201AB8D8AE0009FCAA /* Icon-29@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-29@3x.png"; sourceTree = "<group>"; };
-		5B4316211AB8D8AE0009FCAA /* Icon-40@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40@2x.png"; sourceTree = "<group>"; };
-		5B4316221AB8D8AE0009FCAA /* Icon-40@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40@3x.png"; sourceTree = "<group>"; };
-		5B4316231AB8D8AE0009FCAA /* Icon-60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60@2x.png"; sourceTree = "<group>"; };
-		5B4316241AB8D8AE0009FCAA /* Icon-60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60@3x.png"; sourceTree = "<group>"; };
-		5B4316251AB8D8AE0009FCAA /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; path = iTunesArtwork; sourceTree = "<group>"; };
-		5B4316261AB8D8AE0009FCAA /* iTunesArtwork@2x */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTunesArtwork@2x"; sourceTree = "<group>"; };
-		5B4316311AB8D8B70009FCAA /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-		5B4316321AB8D8B70009FCAA /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-667h@2x.png"; sourceTree = "<group>"; };
-		5B4316331AB8D8B70009FCAA /* Default-736h@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-736h@3x.png"; sourceTree = "<group>"; };
-		5B4316341AB8D8B70009FCAA /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
-		5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChartsDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RealmDemosViewController.xib; path = XIBs/Demos/RealmDemosViewController.xib; sourceTree = SOURCE_ROOT; };
+		5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5B57BBB31A9B26AA0036A6CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		5B57BBB41A9B26AA0036A6CC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		5B57BBB61A9B26AA0036A6CC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -170,7 +258,7 @@
 		5B96243E1B38608C007763E2 /* NegativeStackedBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NegativeStackedBarChartViewController.h; sourceTree = "<group>"; };
 		5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NegativeStackedBarChartViewController.m; sourceTree = "<group>"; };
 		5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NegativeStackedBarChartViewController.xib; sourceTree = "<group>"; };
-		5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonMarker.swift; sourceTree = "<group>"; };
+		5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BalloonMarker.swift; path = "../../Objective-C/Components/BalloonMarker.swift"; sourceTree = "<group>"; };
 		5BD47E5C1ABB0273008FCEC6 /* ChartsDemo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ChartsDemo-Bridging-Header.h"; sourceTree = "<group>"; };
 		5BD47E5D1ABB3C91008FCEC6 /* LineChart2ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineChart2ViewController.h; sourceTree = "<group>"; };
 		5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LineChart2ViewController.m; sourceTree = "<group>"; };
@@ -235,9 +323,18 @@
 		5BEAED3D1ABC1AC60013F194 /* SinusBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SinusBarChartViewController.h; sourceTree = "<group>"; };
 		5BEAED3E1ABC1AC60013F194 /* SinusBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SinusBarChartViewController.m; sourceTree = "<group>"; };
 		5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SinusBarChartViewController.xib; sourceTree = "<group>"; };
+		B64D06EA1FB199130067418D /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		225B361A1F6EB9A50005B3D5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				225B368C1F6EBBB00005B3D5 /* Charts.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		5B57BBAC1A9B26AA0036A6CC /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -258,37 +355,117 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		5B43161E1AB8D8AE0009FCAA /* app-icon */ = {
+		225B361E1F6EB9A50005B3D5 /* Swift */ = {
+			isa = PBXGroup;
+			children = (
+				225B361F1F6EB9A50005B3D5 /* AppDelegate.swift */,
+				225B362F1F6EB9EE0005B3D5 /* DemoBaseViewController.swift */,
+				225B36301F6EB9EE0005B3D5 /* DemoListViewController.swift */,
+				225B363C1F6EBA180005B3D5 /* Components */,
+				225B36331F6EB9FE0005B3D5 /* Formatters */,
+				225B36431F6EBA410005B3D5 /* Demos */,
+			);
+			path = Swift;
+			sourceTree = "<group>";
+		};
+		225B36331F6EB9FE0005B3D5 /* Formatters */ = {
+			isa = PBXGroup;
+			children = (
+				225B36351F6EB9FE0005B3D5 /* DayAxisValueFormatter.swift */,
+				225B36361F6EB9FE0005B3D5 /* DateValueFormatter.swift */,
+				225B36341F6EB9FE0005B3D5 /* IntAxisValueFormatter.swift */,
+				225B36371F6EB9FE0005B3D5 /* LargeValueFormatter.swift */,
+			);
+			path = Formatters;
+			sourceTree = "<group>";
+		};
+		225B363C1F6EBA180005B3D5 /* Components */ = {
+			isa = PBXGroup;
+			children = (
+				5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */,
+				225B363F1F6EBA180005B3D5 /* RadarMarkerView.swift */,
+				225B363D1F6EBA180005B3D5 /* XYMarkerView.swift */,
+			);
+			path = Components;
+			sourceTree = "<group>";
+		};
+		225B36431F6EBA410005B3D5 /* Demos */ = {
 			isa = PBXGroup;
 			children = (
-				5B43161F1AB8D8AE0009FCAA /* Icon-29@2x.png */,
-				5B4316201AB8D8AE0009FCAA /* Icon-29@3x.png */,
-				5B4316211AB8D8AE0009FCAA /* Icon-40@2x.png */,
-				5B4316221AB8D8AE0009FCAA /* Icon-40@3x.png */,
-				5B4316231AB8D8AE0009FCAA /* Icon-60@2x.png */,
-				5B4316241AB8D8AE0009FCAA /* Icon-60@3x.png */,
-				5B4316251AB8D8AE0009FCAA /* iTunesArtwork */,
-				5B4316261AB8D8AE0009FCAA /* iTunesArtwork@2x */,
-			);
-			path = "app-icon";
+				225B36511F6EBA410005B3D5 /* AnotherBarChartViewController.swift */,
+				225B36581F6EBA410005B3D5 /* BarChartViewController.swift */,
+				225B364E1F6EBA410005B3D5 /* BubbleChartViewController.swift */,
+				225B365A1F6EBA410005B3D5 /* CandleStickChartViewController.swift */,
+				225B36481F6EBA410005B3D5 /* ColoredLineChartViewController.swift */,
+				225B36571F6EBA410005B3D5 /* CombinedChartViewController.swift */,
+				225B36531F6EBA410005B3D5 /* CubicLineChartViewController.swift */,
+				225B36461F6EBA410005B3D5 /* HalfPieChartViewController.swift */,
+				225B36551F6EBA410005B3D5 /* HorizontalBarChartViewController.swift */,
+				225B364A1F6EBA410005B3D5 /* LineChart1ViewController.swift */,
+				225B36491F6EBA410005B3D5 /* LineChart2ViewController.swift */,
+				225B364F1F6EBA410005B3D5 /* LineChartFilledViewController.swift */,
+				225B36471F6EBA410005B3D5 /* LineChartTimeViewController.swift */,
+				225B36441F6EBA410005B3D5 /* MultipleLinesChartViewController.swift */,
+				225B36451F6EBA410005B3D5 /* MultipleBarChartViewController.swift */,
+				225B364B1F6EBA410005B3D5 /* NegativeStackedBarChartViewController.swift */,
+				225B36521F6EBA410005B3D5 /* PieChartViewController.swift */,
+				225B36561F6EBA410005B3D5 /* PiePolylineChartViewController.swift */,
+				225B36501F6EBA410005B3D5 /* PositiveNegativeBarChartViewController.swift */,
+				225B36541F6EBA410005B3D5 /* RadarChartViewController.swift */,
+				225B364C1F6EBA410005B3D5 /* ScatterChartViewController.swift */,
+				225B36591F6EBA410005B3D5 /* SinusBarChartViewController.swift */,
+				225B364D1F6EBA410005B3D5 /* StackedBarChartViewController.swift */,
+			);
+			path = Demos;
 			sourceTree = "<group>";
 		};
-		5B4316301AB8D8B70009FCAA /* launch-image */ = {
+		227136F41F6EB665006D2A11 /* XIBs */ = {
 			isa = PBXGroup;
 			children = (
-				5B4316311AB8D8B70009FCAA /* Default-568h@2x.png */,
-				5B4316321AB8D8B70009FCAA /* Default-667h@2x.png */,
-				5B4316331AB8D8B70009FCAA /* Default-736h@3x.png */,
-				5B4316341AB8D8B70009FCAA /* Default@2x.png */,
+				5B8EAF231AB3271B009697AA /* DemoListViewController.xib */,
+				5B613DB41D526EA8000F1E98 /* RadarMarkerView.xib */,
+				227136F61F6EB69D006D2A11 /* Demos */,
 			);
-			path = "launch-image";
+			path = XIBs;
+			sourceTree = "<group>";
+		};
+		227136F61F6EB69D006D2A11 /* Demos */ = {
+			isa = PBXGroup;
+			children = (
+				5BEAED111ABBFB2B0013F194 /* AnotherBarChartViewController.xib */,
+				5BD47E641ABB424E008FCEC6 /* BarChartViewController.xib */,
+				55E3564D1ADC638F00A57971 /* BubbleChartViewController.xib */,
+				5BEAED2B1ABC160F0013F194 /* CandleStickChartViewController.xib */,
+				5BEAED3A1ABC199F0013F194 /* ColoredLineChartViewController.xib */,
+				5BDEDC461ABB871E007D3A60 /* CombinedChartViewController.xib */,
+				5BEAED301ABC18F00013F194 /* CubicLineChartViewController.xib */,
+				5BE6737F1D5B496500A87BA2 /* HalfPieChartViewController.xib */,
+				5BDEDC401ABB7F73007D3A60 /* HorizontalBarChartViewController.xib */,
+				5BD8F0731AB89CE500566E05 /* LineChart1ViewController.xib */,
+				5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */,
+				5BE6738E1D5B4E0900A87BA2 /* LineChartFilledViewController.xib */,
+				5BE673911D5B4E0900A87BA2 /* LineChartTimeViewController.xib */,
+				5BEAED211ABC0BE20013F194 /* MultipleBarChartViewController.xib */,
+				5BEAED241ABC0BE20013F194 /* MultipleLinesChartViewController.xib */,
+				5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */,
+				5B0CC7841ABB875400665592 /* PieChartViewController.xib */,
+				0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */,
+				5BE7E7611C693098000A0377 /* PositiveNegativeBarChartViewController.xib */,
+				5BEAED351ABC192F0013F194 /* RadarChartViewController.xib */,
+				5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */,
+				5BEAED171ABBFB340013F194 /* ScatterChartViewController.xib */,
+				5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */,
+				5BEAED1A1ABBFB340013F194 /* StackedBarChartViewController.xib */,
+			);
+			path = Demos;
 			sourceTree = "<group>";
 		};
 		5B57BBA61A9B26AA0036A6CC = {
 			isa = PBXGroup;
 			children = (
-				066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */,
-				5B57BBB11A9B26AA0036A6CC /* Classes */,
+				5B57BBB11A9B26AA0036A6CC /* Objective-C */,
+				225B361E1F6EB9A50005B3D5 /* Swift */,
+				227136F41F6EB665006D2A11 /* XIBs */,
 				5B8EAF2E1AB32E15009697AA /* Resources */,
 				5B57BBB21A9B26AA0036A6CC /* Supporting Files */,
 				5B57BBB01A9B26AA0036A6CC /* Products */,
@@ -299,26 +476,26 @@
 		5B57BBB01A9B26AA0036A6CC /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */,
+				5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */,
+				225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		5B57BBB11A9B26AA0036A6CC /* Classes */ = {
+		5B57BBB11A9B26AA0036A6CC /* Objective-C */ = {
 			isa = PBXGroup;
 			children = (
 				5B57BBB61A9B26AA0036A6CC /* AppDelegate.h */,
 				5B57BBB71A9B26AA0036A6CC /* AppDelegate.m */,
 				5B57BBB91A9B26AA0036A6CC /* DemoListViewController.h */,
 				5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */,
-				5B8EAF231AB3271B009697AA /* DemoListViewController.xib */,
 				5B8EAF251AB32CF5009697AA /* DemoBaseViewController.h */,
 				5B8EAF261AB32CF5009697AA /* DemoBaseViewController.m */,
 				5BE377D41D42511A006EB34F /* Formatters */,
 				5BD47E541ABB0177008FCEC6 /* Components */,
 				5BD8F06F1AB89C7100566E05 /* Demos */,
 			);
-			path = Classes;
+			path = "Objective-C";
 			sourceTree = "<group>";
 		};
 		5B57BBB21A9B26AA0036A6CC /* Supporting Files */ = {
@@ -342,9 +519,8 @@
 		5B8EAF2E1AB32E15009697AA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				B64D06EA1FB199130067418D /* Launch Screen.storyboard */,
 				5B8EAF2F1AB32E15009697AA /* Images.xcassets */,
-				5B43161E1AB8D8AE0009FCAA /* app-icon */,
-				5B4316301AB8D8B70009FCAA /* launch-image */,
 				5B613DA21D526AD5000F1E98 /* markers */,
 			);
 			path = Resources;
@@ -353,9 +529,7 @@
 		5BD47E541ABB0177008FCEC6 /* Components */ = {
 			isa = PBXGroup;
 			children = (
-				5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */,
 				5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */,
-				5B613DB41D526EA8000F1E98 /* RadarMarkerView.xib */,
 				5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */,
 			);
 			path = Components;
@@ -366,76 +540,50 @@
 			children = (
 				5BEAED0F1ABBFB2B0013F194 /* AnotherBarChartViewController.h */,
 				5BEAED101ABBFB2B0013F194 /* AnotherBarChartViewController.m */,
-				5BEAED111ABBFB2B0013F194 /* AnotherBarChartViewController.xib */,
 				5BD47E621ABB424E008FCEC6 /* BarChartViewController.h */,
 				5BD47E631ABB424E008FCEC6 /* BarChartViewController.m */,
-				5BD47E641ABB424E008FCEC6 /* BarChartViewController.xib */,
 				55E3564E1ADC638F00A57971 /* BubbleChartViewController.h */,
 				55E3564F1ADC638F00A57971 /* BubbleChartViewController.m */,
-				55E3564D1ADC638F00A57971 /* BubbleChartViewController.xib */,
 				5BEAED291ABC160F0013F194 /* CandleStickChartViewController.h */,
 				5BEAED2A1ABC160F0013F194 /* CandleStickChartViewController.m */,
-				5BEAED2B1ABC160F0013F194 /* CandleStickChartViewController.xib */,
 				5BEAED381ABC199F0013F194 /* ColoredLineChartViewController.h */,
 				5BEAED391ABC199F0013F194 /* ColoredLineChartViewController.m */,
-				5BEAED3A1ABC199F0013F194 /* ColoredLineChartViewController.xib */,
 				5BDEDC441ABB871E007D3A60 /* CombinedChartViewController.h */,
 				5BDEDC451ABB871E007D3A60 /* CombinedChartViewController.m */,
-				5BDEDC461ABB871E007D3A60 /* CombinedChartViewController.xib */,
 				5BEAED2E1ABC18F00013F194 /* CubicLineChartViewController.h */,
 				5BEAED2F1ABC18F00013F194 /* CubicLineChartViewController.m */,
-				5BEAED301ABC18F00013F194 /* CubicLineChartViewController.xib */,
 				5BE6737D1D5B496500A87BA2 /* HalfPieChartViewController.h */,
 				5BE6737E1D5B496500A87BA2 /* HalfPieChartViewController.m */,
-				5BE6737F1D5B496500A87BA2 /* HalfPieChartViewController.xib */,
 				5BDEDC3E1ABB7F73007D3A60 /* HorizontalBarChartViewController.h */,
 				5BDEDC3F1ABB7F73007D3A60 /* HorizontalBarChartViewController.m */,
-				5BDEDC401ABB7F73007D3A60 /* HorizontalBarChartViewController.xib */,
 				5BD8F0711AB89CE500566E05 /* LineChart1ViewController.h */,
 				5BD8F0721AB89CE500566E05 /* LineChart1ViewController.m */,
-				5BD8F0731AB89CE500566E05 /* LineChart1ViewController.xib */,
 				5BD47E5D1ABB3C91008FCEC6 /* LineChart2ViewController.h */,
 				5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */,
-				5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */,
 				5BE6738C1D5B4E0900A87BA2 /* LineChartFilledViewController.h */,
 				5BE6738D1D5B4E0900A87BA2 /* LineChartFilledViewController.m */,
-				5BE6738E1D5B4E0900A87BA2 /* LineChartFilledViewController.xib */,
 				5BE6738F1D5B4E0900A87BA2 /* LineChartTimeViewController.h */,
 				5BE673901D5B4E0900A87BA2 /* LineChartTimeViewController.m */,
-				5BE673911D5B4E0900A87BA2 /* LineChartTimeViewController.xib */,
 				5BEAED1F1ABC0BE20013F194 /* MultipleBarChartViewController.h */,
 				5BEAED201ABC0BE20013F194 /* MultipleBarChartViewController.m */,
-				5BEAED211ABC0BE20013F194 /* MultipleBarChartViewController.xib */,
 				5BEAED221ABC0BE20013F194 /* MultipleLinesChartViewController.h */,
 				5BEAED231ABC0BE20013F194 /* MultipleLinesChartViewController.m */,
-				5BEAED241ABC0BE20013F194 /* MultipleLinesChartViewController.xib */,
 				5B96243E1B38608C007763E2 /* NegativeStackedBarChartViewController.h */,
 				5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */,
-				5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */,
 				5B0CC7821ABB875400665592 /* PieChartViewController.h */,
 				5B0CC7831ABB875400665592 /* PieChartViewController.m */,
-				5B0CC7841ABB875400665592 /* PieChartViewController.xib */,
 				0439A3511C9FF95F00496F83 /* PiePolylineChartViewController.h */,
 				0439A3521C9FF95F00496F83 /* PiePolylineChartViewController.m */,
-				0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */,
 				5BE7E75F1C693098000A0377 /* PositiveNegativeBarChartViewController.h */,
 				5BE7E7601C693098000A0377 /* PositiveNegativeBarChartViewController.m */,
-				5BE7E7611C693098000A0377 /* PositiveNegativeBarChartViewController.xib */,
 				5BEAED331ABC192F0013F194 /* RadarChartViewController.h */,
 				5BEAED341ABC192F0013F194 /* RadarChartViewController.m */,
-				5BEAED351ABC192F0013F194 /* RadarChartViewController.xib */,
-				5B1B5DA71E911A15006D1375 /* RealmDemosViewController.h */,
-				5B1B5DA81E911A15006D1375 /* RealmDemosViewController.m */,
-				5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */,
 				5BEAED151ABBFB340013F194 /* ScatterChartViewController.h */,
 				5BEAED161ABBFB340013F194 /* ScatterChartViewController.m */,
-				5BEAED171ABBFB340013F194 /* ScatterChartViewController.xib */,
 				5BEAED3D1ABC1AC60013F194 /* SinusBarChartViewController.h */,
 				5BEAED3E1ABC1AC60013F194 /* SinusBarChartViewController.m */,
-				5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */,
 				5BEAED181ABBFB340013F194 /* StackedBarChartViewController.h */,
 				5BEAED191ABBFB340013F194 /* StackedBarChartViewController.m */,
-				5BEAED1A1ABBFB340013F194 /* StackedBarChartViewController.xib */,
 			);
 			path = Demos;
 			sourceTree = "<group>";
@@ -457,9 +605,28 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		5B57BBAE1A9B26AA0036A6CC /* ChartsDemo */ = {
+		225B361C1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS-Swift" */;
+			buildPhases = (
+				225B36191F6EB9A50005B3D5 /* Sources */,
+				225B361A1F6EB9A50005B3D5 /* Frameworks */,
+				225B361B1F6EB9A50005B3D5 /* Resources */,
+				225B36901F6EBBB10005B3D5 /* Embed Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				225B368F1F6EBBB00005B3D5 /* PBXTargetDependency */,
+			);
+			name = "ChartsDemo-iOS-Swift";
+			productName = "ChartsDemo-Swift";
+			productReference = 225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */;
+			productType = "com.apple.product-type.application";
+		};
+		5B57BBAE1A9B26AA0036A6CC /* ChartsDemo-iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo" */;
+			buildConfigurationList = 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS" */;
 			buildPhases = (
 				5B57BBAB1A9B26AA0036A6CC /* Sources */,
 				5B57BBAC1A9B26AA0036A6CC /* Frameworks */,
@@ -471,9 +638,9 @@
 			dependencies = (
 				0630AE541D81271B008859B0 /* PBXTargetDependency */,
 			);
-			name = ChartsDemo;
+			name = "ChartsDemo-iOS";
 			productName = chartstest;
-			productReference = 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */;
+			productReference = 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -484,18 +651,23 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = dcg;
 				TargetAttributes = {
+					225B361C1F6EB9A50005B3D5 = {
+						CreatedOnToolsVersion = 9.0;
+						LastSwiftMigration = 1000;
+					};
 					5B57BBAE1A9B26AA0036A6CC = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
+						ProvisioningStyle = Manual;
 					};
 				};
 			};
-			buildConfigurationList = 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo" */;
+			buildConfigurationList = 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo-iOS" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -512,7 +684,8 @@
 			);
 			projectRoot = "";
 			targets = (
-				5B57BBAE1A9B26AA0036A6CC /* ChartsDemo */,
+				5B57BBAE1A9B26AA0036A6CC /* ChartsDemo-iOS */,
+				225B361C1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift */,
 			);
 		};
 /* End PBXProject section */
@@ -535,30 +708,59 @@
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
+		225B361B1F6EB9A50005B3D5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				225B367C1F6EBA640005B3D5 /* HorizontalBarChartViewController.xib in Resources */,
+				225B36841F6EBA640005B3D5 /* PieChartViewController.xib in Resources */,
+				225B36741F6EBA640005B3D5 /* AnotherBarChartViewController.xib in Resources */,
+				225B36781F6EBA640005B3D5 /* ColoredLineChartViewController.xib in Resources */,
+				225B36791F6EBA640005B3D5 /* CombinedChartViewController.xib in Resources */,
+				225B367B1F6EBA640005B3D5 /* HalfPieChartViewController.xib in Resources */,
+				068A9B1A1FBBF355003CF1AD /* Launch Screen.storyboard in Resources */,
+				225B367A1F6EBA640005B3D5 /* CubicLineChartViewController.xib in Resources */,
+				225B368B1F6EBA640005B3D5 /* StackedBarChartViewController.xib in Resources */,
+				225B36821F6EBA640005B3D5 /* MultipleLinesChartViewController.xib in Resources */,
+				068A9B191FBBF351003CF1AD /* Images.xcassets in Resources */,
+				225B36751F6EBA640005B3D5 /* BarChartViewController.xib in Resources */,
+				225B367F1F6EBA640005B3D5 /* LineChartFilledViewController.xib in Resources */,
+				225B36801F6EBA640005B3D5 /* LineChartTimeViewController.xib in Resources */,
+				225B36811F6EBA640005B3D5 /* MultipleBarChartViewController.xib in Resources */,
+				225B367D1F6EBA640005B3D5 /* LineChart1ViewController.xib in Resources */,
+				068A9B1B1FBBF366003CF1AD /* radar_marker@3x.png in Resources */,
+				225B36721F6EBA5E0005B3D5 /* DemoListViewController.xib in Resources */,
+				225B36891F6EBA640005B3D5 /* ScatterChartViewController.xib in Resources */,
+				225B36851F6EBA640005B3D5 /* PiePolylineChartViewController.xib in Resources */,
+				225B36771F6EBA640005B3D5 /* CandleStickChartViewController.xib in Resources */,
+				225B36871F6EBA640005B3D5 /* RadarChartViewController.xib in Resources */,
+				225B368A1F6EBA640005B3D5 /* SinusBarChartViewController.xib in Resources */,
+				225B36731F6EBA5E0005B3D5 /* RadarMarkerView.xib in Resources */,
+				225B367E1F6EBA640005B3D5 /* LineChart2ViewController.xib in Resources */,
+				225B36881F6EBA640005B3D5 /* RealmDemosViewController.xib in Resources */,
+				225B36861F6EBA640005B3D5 /* PositiveNegativeBarChartViewController.xib in Resources */,
+				225B36831F6EBA640005B3D5 /* NegativeStackedBarChartViewController.xib in Resources */,
+				225B36761F6EBA640005B3D5 /* BubbleChartViewController.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		5B57BBAD1A9B26AA0036A6CC /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				5B8EAF301AB32E15009697AA /* Images.xcassets in Resources */,
 				5BE673931D5B4E0900A87BA2 /* LineChartFilledViewController.xib in Resources */,
-				5B43162B1AB8D8AE0009FCAA /* Icon-60@2x.png in Resources */,
-				5B43162E1AB8D8AE0009FCAA /* iTunesArtwork@2x in Resources */,
-				5B4316281AB8D8AE0009FCAA /* Icon-29@3x.png in Resources */,
-				5B4316361AB8D8B70009FCAA /* Default-667h@2x.png in Resources */,
 				5BEAED2D1ABC160F0013F194 /* CandleStickChartViewController.xib in Resources */,
 				5B613DB51D526EA8000F1E98 /* RadarMarkerView.xib in Resources */,
 				5BD47E611ABB3C91008FCEC6 /* LineChart2ViewController.xib in Resources */,
 				5BEAED131ABBFB2B0013F194 /* AnotherBarChartViewController.xib in Resources */,
 				5BEAED411ABC1AC60013F194 /* SinusBarChartViewController.xib in Resources */,
 				5BEAED371ABC192F0013F194 /* RadarChartViewController.xib in Resources */,
-				5B4316351AB8D8B70009FCAA /* Default-568h@2x.png in Resources */,
 				5B8EAF241AB3271B009697AA /* DemoListViewController.xib in Resources */,
 				5BEAED261ABC0BE20013F194 /* MultipleBarChartViewController.xib in Resources */,
-				5B43162A1AB8D8AE0009FCAA /* Icon-40@3x.png in Resources */,
 				5BEAED3C1ABC199F0013F194 /* ColoredLineChartViewController.xib in Resources */,
 				5BEAED321ABC18F00013F194 /* CubicLineChartViewController.xib in Resources */,
 				5BEAED281ABC0BE20013F194 /* MultipleLinesChartViewController.xib in Resources */,
-				5B4316381AB8D8B70009FCAA /* Default@2x.png in Resources */,
 				5B9624421B38608C007763E2 /* NegativeStackedBarChartViewController.xib in Resources */,
 				5B613DA41D526AD5000F1E98 /* radar_marker@3x.png in Resources */,
 				5BE7E7631C693098000A0377 /* PositiveNegativeBarChartViewController.xib in Resources */,
@@ -567,36 +769,72 @@
 				0471CBFC1CA1090A00E52DBC /* PiePolylineChartViewController.xib in Resources */,
 				5BD8F0751AB89CE500566E05 /* LineChart1ViewController.xib in Resources */,
 				5BE673811D5B496500A87BA2 /* HalfPieChartViewController.xib in Resources */,
-				5B43162D1AB8D8AE0009FCAA /* iTunesArtwork in Resources */,
+				B64D06EB1FB199130067418D /* Launch Screen.storyboard in Resources */,
 				5BD47E661ABB424E008FCEC6 /* BarChartViewController.xib in Resources */,
 				5BDEDC421ABB7F73007D3A60 /* HorizontalBarChartViewController.xib in Resources */,
 				5BDEDC481ABB871E007D3A60 /* CombinedChartViewController.xib in Resources */,
-				5B4316371AB8D8B70009FCAA /* Default-736h@3x.png in Resources */,
 				5BE673951D5B4E0900A87BA2 /* LineChartTimeViewController.xib in Resources */,
-				5B4316291AB8D8AE0009FCAA /* Icon-40@2x.png in Resources */,
 				5BEAED1E1ABBFB340013F194 /* StackedBarChartViewController.xib in Resources */,
-				5B4316271AB8D8AE0009FCAA /* Icon-29@2x.png in Resources */,
 				5B1B5DAB1E911A15006D1375 /* RealmDemosViewController.xib in Resources */,
 				55E356501ADC638F00A57971 /* BubbleChartViewController.xib in Resources */,
-				5B43162C1AB8D8AE0009FCAA /* Icon-60@3x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		225B36191F6EB9A50005B3D5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				225B365E1F6EBA470005B3D5 /* LineChartTimeViewController.swift in Sources */,
+				225B36311F6EB9EE0005B3D5 /* DemoBaseViewController.swift in Sources */,
+				225B36391F6EBA040005B3D5 /* DayAxisValueFormatter.swift in Sources */,
+				225B36661F6EBA470005B3D5 /* LineChartFilledViewController.swift in Sources */,
+				225B366A1F6EBA470005B3D5 /* CubicLineChartViewController.swift in Sources */,
+				225B36671F6EBA470005B3D5 /* PositiveNegativeBarChartViewController.swift in Sources */,
+				225B363A1F6EBA040005B3D5 /* DateValueFormatter.swift in Sources */,
+				5B442CD223D9B0A300B1F801 /* BalloonMarker.swift in Sources */,
+				225B366D1F6EBA470005B3D5 /* PiePolylineChartViewController.swift in Sources */,
+				225B366F1F6EBA470005B3D5 /* BarChartViewController.swift in Sources */,
+				225B36601F6EBA470005B3D5 /* LineChart2ViewController.swift in Sources */,
+				225B366C1F6EBA470005B3D5 /* HorizontalBarChartViewController.swift in Sources */,
+				225B36401F6EBA1D0005B3D5 /* XYMarkerView.swift in Sources */,
+				225B36421F6EBA1D0005B3D5 /* RadarMarkerView.swift in Sources */,
+				225B366B1F6EBA470005B3D5 /* RadarChartViewController.swift in Sources */,
+				225B36611F6EBA470005B3D5 /* LineChart1ViewController.swift in Sources */,
+				225B36691F6EBA470005B3D5 /* PieChartViewController.swift in Sources */,
+				225B365B1F6EBA470005B3D5 /* MultipleLinesChartViewController.swift in Sources */,
+				225B365F1F6EBA470005B3D5 /* ColoredLineChartViewController.swift in Sources */,
+				225B36201F6EB9A50005B3D5 /* AppDelegate.swift in Sources */,
+				225B36321F6EB9EE0005B3D5 /* DemoListViewController.swift in Sources */,
+				225B36711F6EBA470005B3D5 /* CandleStickChartViewController.swift in Sources */,
+				225B36631F6EBA470005B3D5 /* ScatterChartViewController.swift in Sources */,
+				225B365C1F6EBA470005B3D5 /* MultipleBarChartViewController.swift in Sources */,
+				225B366E1F6EBA470005B3D5 /* CombinedChartViewController.swift in Sources */,
+				225B36641F6EBA470005B3D5 /* StackedBarChartViewController.swift in Sources */,
+				225B36651F6EBA470005B3D5 /* BubbleChartViewController.swift in Sources */,
+				225B36381F6EBA040005B3D5 /* IntAxisValueFormatter.swift in Sources */,
+				225B365D1F6EBA470005B3D5 /* HalfPieChartViewController.swift in Sources */,
+				225B36701F6EBA470005B3D5 /* SinusBarChartViewController.swift in Sources */,
+				225B36681F6EBA470005B3D5 /* AnotherBarChartViewController.swift in Sources */,
+				225B36621F6EBA470005B3D5 /* NegativeStackedBarChartViewController.swift in Sources */,
+				225B363B1F6EBA040005B3D5 /* LargeValueFormatter.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		5B57BBAB1A9B26AA0036A6CC /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				5B613DF21D5A60DF000F1E98 /* LargeValueFormatter.swift in Sources */,
-				5B1B5DAA1E911A15006D1375 /* RealmDemosViewController.m in Sources */,
 				5BEAED1B1ABBFB340013F194 /* ScatterChartViewController.m in Sources */,
 				5B0CC7851ABB875400665592 /* PieChartViewController.m in Sources */,
 				0439A3541C9FF95F00496F83 /* PiePolylineChartViewController.m in Sources */,
 				5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */,
 				5BD47E651ABB424E008FCEC6 /* BarChartViewController.m in Sources */,
 				5BDEDC471ABB871E007D3A60 /* CombinedChartViewController.m in Sources */,
+				5B442CD323D9B0AB00B1F801 /* BalloonMarker.swift in Sources */,
 				5BE377F21D47FDF1006EB34F /* IntAxisValueFormatter.m in Sources */,
 				5BD8F0741AB89CE500566E05 /* LineChart1ViewController.m in Sources */,
 				5BE377DE1D425151006EB34F /* DayAxisValueFormatter.m in Sources */,
@@ -606,7 +844,6 @@
 				5BEAED251ABC0BE20013F194 /* MultipleBarChartViewController.m in Sources */,
 				5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */,
 				55E356511ADC638F00A57971 /* BubbleChartViewController.m in Sources */,
-				5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */,
 				5BEAED2C1ABC160F0013F194 /* CandleStickChartViewController.m in Sources */,
 				5BEAED271ABC0BE20013F194 /* MultipleLinesChartViewController.m in Sources */,
 				5BE6739A1D5BAD7E00A87BA2 /* DateValueFormatter.m in Sources */,
@@ -635,30 +872,101 @@
 			name = Charts;
 			targetProxy = 0630AE531D81271B008859B0 /* PBXContainerItemProxy */;
 		};
+		225B368F1F6EBBB00005B3D5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Charts;
+			targetProxy = 225B368E1F6EBBB00005B3D5 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+		225B362D1F6EB9A50005B3D5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-Swift";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
+			};
+			name = Debug;
+		};
+		225B362E1F6EB9A50005B3D5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-Swift";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
+			};
+			name = Release;
+		};
 		5B57BBD01A9B26AA0036A6CC /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -677,34 +985,42 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		5B57BBD11A9B26AA0036A6CC /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -716,57 +1032,67 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
 		};
 		5B57BBD31A9B26AA0036A6CC /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(SOURCE_ROOT)/../Carthage/Build/iOS";
 				INFOPLIST_FILE = "Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = ChartsDemo;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				PRODUCT_NAME = "ChartsDemo-iOS";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		5B57BBD41A9B26AA0036A6CC /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 066750AC1E2DB68D00E22DC6 /* Carthage.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(SOURCE_ROOT)/../Carthage/Build/iOS";
 				INFOPLIST_FILE = "Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = ChartsDemo;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				PRODUCT_NAME = "ChartsDemo-iOS";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo" */ = {
+		225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS-Swift" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				225B362D1F6EB9A50005B3D5 /* Debug */,
+				225B362E1F6EB9A50005B3D5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo-iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				5B57BBD01A9B26AA0036A6CC /* Debug */,
@@ -775,7 +1101,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo" */ = {
+		5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				5B57BBD31A9B26AA0036A6CC /* Debug */,
diff --git a/ChartsDemo/Classes/AppDelegate.h b/ChartsDemo-iOS/Objective-C/AppDelegate.h
similarity index 100%
rename from ChartsDemo/Classes/AppDelegate.h
rename to ChartsDemo-iOS/Objective-C/AppDelegate.h
diff --git a/ChartsDemo/Classes/AppDelegate.m b/ChartsDemo-iOS/Objective-C/AppDelegate.m
similarity index 100%
rename from ChartsDemo/Classes/AppDelegate.m
rename to ChartsDemo-iOS/Objective-C/AppDelegate.m
diff --git a/ChartsDemo/Classes/Components/BalloonMarker.swift b/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift
similarity index 50%
rename from ChartsDemo/Classes/Components/BalloonMarker.swift
rename to ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift
index ce9284675f..b36c3fe0b1 100644
--- a/ChartsDemo/Classes/Components/BalloonMarker.swift
+++ b/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift
@@ -11,26 +11,26 @@
 
 import Foundation
 import Charts
-
+#if canImport(UIKit)
+    import UIKit
+#endif
 
 open class BalloonMarker: MarkerImage
 {
-    open var color: UIColor?
-    open var arrowSize = CGSize(width: 15, height: 11)
-    open var font: UIFont?
-    open var textColor: UIColor?
-    open var insets = UIEdgeInsets()
-    open var minimumSize = CGSize()
+    @objc open var color: UIColor
+    @objc open var arrowSize = CGSize(width: 15, height: 11)
+    @objc open var font: UIFont
+    @objc open var textColor: UIColor
+    @objc open var insets: UIEdgeInsets
+    @objc open var minimumSize = CGSize()
     
     fileprivate var label: String?
     fileprivate var _labelSize: CGSize = CGSize()
     fileprivate var _paragraphStyle: NSMutableParagraphStyle?
-    fileprivate var _drawAttributes = [String : AnyObject]()
+    fileprivate var _drawAttributes = [NSAttributedString.Key : Any]()
     
-    public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets)
+    @objc public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets)
     {
-        super.init()
-        
         self.color = color
         self.font = font
         self.textColor = textColor
@@ -38,15 +38,52 @@ open class BalloonMarker: MarkerImage
         
         _paragraphStyle = NSParagraphStyle.default.mutableCopy() as? NSMutableParagraphStyle
         _paragraphStyle?.alignment = .center
+        super.init()
     }
     
     open override func offsetForDrawing(atPoint point: CGPoint) -> CGPoint
     {
-        let size = self.size
-        var point = point
-        point.x -= size.width / 2.0
-        point.y -= size.height
-        return super.offsetForDrawing(atPoint: point)
+        var offset = self.offset
+        var size = self.size
+
+        if size.width == 0.0 && image != nil
+        {
+            size.width = image!.size.width
+        }
+        if size.height == 0.0 && image != nil
+        {
+            size.height = image!.size.height
+        }
+
+        let width = size.width
+        let height = size.height
+        let padding: CGFloat = 8.0
+
+        var origin = point
+        origin.x -= width / 2
+        origin.y -= height
+
+        if origin.x + offset.x < 0.0
+        {
+            offset.x = -origin.x + padding
+        }
+        else if let chart = chartView,
+            origin.x + width + offset.x > chart.bounds.size.width
+        {
+            offset.x = chart.bounds.size.width - origin.x - width - padding
+        }
+
+        if origin.y + offset.y < 0
+        {
+            offset.y = height + padding;
+        }
+        else if let chart = chartView,
+            origin.y + height + offset.y > chart.bounds.size.height
+        {
+            offset.y = chart.bounds.size.height - origin.y - height - padding
+        }
+
+        return offset
     }
     
     open override func draw(context: CGContext, point: CGPoint)
@@ -65,10 +102,41 @@ open class BalloonMarker: MarkerImage
         rect.origin.y -= size.height
         
         context.saveGState()
-        
-        if let color = color
+
+        context.setFillColor(color.cgColor)
+
+        if offset.y > 0
+        {
+            context.beginPath()
+            context.move(to: CGPoint(
+                x: rect.origin.x,
+                y: rect.origin.y + arrowSize.height))
+            context.addLine(to: CGPoint(
+                x: rect.origin.x + (rect.size.width - arrowSize.width) / 2.0,
+                y: rect.origin.y + arrowSize.height))
+            //arrow vertex
+            context.addLine(to: CGPoint(
+                x: point.x,
+                y: point.y))
+            context.addLine(to: CGPoint(
+                x: rect.origin.x + (rect.size.width + arrowSize.width) / 2.0,
+                y: rect.origin.y + arrowSize.height))
+            context.addLine(to: CGPoint(
+                x: rect.origin.x + rect.size.width,
+                y: rect.origin.y + arrowSize.height))
+            context.addLine(to: CGPoint(
+                x: rect.origin.x + rect.size.width,
+                y: rect.origin.y + rect.size.height))
+            context.addLine(to: CGPoint(
+                x: rect.origin.x,
+                y: rect.origin.y + rect.size.height))
+            context.addLine(to: CGPoint(
+                x: rect.origin.x,
+                y: rect.origin.y + arrowSize.height))
+            context.fillPath()
+        }
+        else
         {
-            context.setFillColor(color.cgColor)
             context.beginPath()
             context.move(to: CGPoint(
                 x: rect.origin.x,
@@ -82,9 +150,10 @@ open class BalloonMarker: MarkerImage
             context.addLine(to: CGPoint(
                 x: rect.origin.x + (rect.size.width + arrowSize.width) / 2.0,
                 y: rect.origin.y + rect.size.height - arrowSize.height))
+            //arrow vertex
             context.addLine(to: CGPoint(
-                x: rect.origin.x + rect.size.width / 2.0,
-                y: rect.origin.y + rect.size.height))
+                x: point.x,
+                y: point.y))
             context.addLine(to: CGPoint(
                 x: rect.origin.x + (rect.size.width - arrowSize.width) / 2.0,
                 y: rect.origin.y + rect.size.height - arrowSize.height))
@@ -97,7 +166,12 @@ open class BalloonMarker: MarkerImage
             context.fillPath()
         }
         
-        rect.origin.y += self.insets.top
+        if offset.y > 0 {
+            rect.origin.y += self.insets.top + arrowSize.height
+        } else {
+            rect.origin.y += self.insets.top
+        }
+
         rect.size.height -= self.insets.top + self.insets.bottom
         
         UIGraphicsPushContext(context)
@@ -114,16 +188,16 @@ open class BalloonMarker: MarkerImage
         setLabel(String(entry.y))
     }
     
-    open func setLabel(_ newLabel: String)
+    @objc open func setLabel(_ newLabel: String)
     {
         label = newLabel
         
         _drawAttributes.removeAll()
-        _drawAttributes[NSFontAttributeName] = self.font
-        _drawAttributes[NSParagraphStyleAttributeName] = _paragraphStyle
-        _drawAttributes[NSForegroundColorAttributeName] = self.textColor
+        _drawAttributes[.font] = self.font
+        _drawAttributes[.paragraphStyle] = _paragraphStyle
+        _drawAttributes[.foregroundColor] = self.textColor
         
-        _labelSize = label?.size(attributes: _drawAttributes) ?? CGSize.zero
+        _labelSize = label?.size(withAttributes: _drawAttributes) ?? CGSize.zero
         
         var size = CGSize()
         size.width = _labelSize.width + self.insets.left + self.insets.right
diff --git a/ChartsDemo/Classes/Components/RadarMarkerView.swift b/ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift
similarity index 93%
rename from ChartsDemo/Classes/Components/RadarMarkerView.swift
rename to ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift
index 6f286bf013..c0d62a3d19 100644
--- a/ChartsDemo/Classes/Components/RadarMarkerView.swift
+++ b/ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift
@@ -11,6 +11,9 @@
 
 import Foundation
 import Charts
+#if canImport(UIKit)
+    import UIKit
+#endif
 
 open class RadarMarkerView: MarkerView
 {
diff --git a/ChartsDemo/Classes/Components/XYMarkerView.swift b/ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift
similarity index 79%
rename from ChartsDemo/Classes/Components/XYMarkerView.swift
rename to ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift
index a3e91d0804..f985bd50f0 100644
--- a/ChartsDemo/Classes/Components/XYMarkerView.swift
+++ b/ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift
@@ -6,13 +6,16 @@
 
 import Foundation
 import Charts
+#if canImport(UIKit)
+    import UIKit
+#endif
 
 open class XYMarkerView: BalloonMarker
 {
-    open var xAxisValueFormatter: IAxisValueFormatter?
+    @objc open var xAxisValueFormatter: IAxisValueFormatter?
     fileprivate var yFormatter = NumberFormatter()
     
-    public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets,
+    @objc public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets,
                 xAxisValueFormatter: IAxisValueFormatter)
     {
         super.init(color: color, font: font, textColor: textColor, insets: insets)
diff --git a/ChartsDemo/Classes/DemoBaseViewController.h b/ChartsDemo-iOS/Objective-C/DemoBaseViewController.h
similarity index 96%
rename from ChartsDemo/Classes/DemoBaseViewController.h
rename to ChartsDemo-iOS/Objective-C/DemoBaseViewController.h
index 3fe7ed2230..fd31bfd7da 100644
--- a/ChartsDemo/Classes/DemoBaseViewController.h
+++ b/ChartsDemo-iOS/Objective-C/DemoBaseViewController.h
@@ -10,7 +10,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface DemoBaseViewController : UIViewController
 {
diff --git a/ChartsDemo/Classes/DemoBaseViewController.m b/ChartsDemo-iOS/Objective-C/DemoBaseViewController.m
similarity index 94%
rename from ChartsDemo/Classes/DemoBaseViewController.m
rename to ChartsDemo-iOS/Objective-C/DemoBaseViewController.m
index c5908a844c..4e6392a91d 100644
--- a/ChartsDemo/Classes/DemoBaseViewController.m
+++ b/ChartsDemo-iOS/Objective-C/DemoBaseViewController.m
@@ -170,7 +170,8 @@ - (IBAction)optionsButtonTapped:(id)sender
     _optionsTableView.backgroundColor = [UIColor colorWithWhite:0.f alpha:0.9f];
     _optionsTableView.delegate = self;
     _optionsTableView.dataSource = self;
-    
+    [_optionsTableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"Cell"];
+
     _optionsTableView.translatesAutoresizingMaskIntoConstraints = NO;
     
     NSMutableArray *constraints = [[NSMutableArray alloc] init];
@@ -224,23 +225,14 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (tableView == _optionsTableView)
-    {
-        UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell"];
-        if (!cell)
-        {
-            cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"Cell"];
-            cell.backgroundView = nil;
-            cell.backgroundColor = UIColor.clearColor;
-            cell.textLabel.textColor = UIColor.whiteColor;
-        }
-        
-        cell.textLabel.text = self.options[indexPath.row][@"label"];
-        
-        return cell;
-    }
-    
-    return nil;
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
+    cell.backgroundView = nil;
+    cell.backgroundColor = UIColor.clearColor;
+    cell.textLabel.textColor = UIColor.whiteColor;
+
+    cell.textLabel.text = self.options[indexPath.row][@"label"];
+
+    return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
diff --git a/ChartsDemo/Classes/DemoListViewController.h b/ChartsDemo-iOS/Objective-C/DemoListViewController.h
similarity index 100%
rename from ChartsDemo/Classes/DemoListViewController.h
rename to ChartsDemo-iOS/Objective-C/DemoListViewController.h
diff --git a/ChartsDemo/Classes/DemoListViewController.m b/ChartsDemo-iOS/Objective-C/DemoListViewController.m
similarity index 96%
rename from ChartsDemo/Classes/DemoListViewController.m
rename to ChartsDemo-iOS/Objective-C/DemoListViewController.m
index d1f2f0dc78..77576d0321 100644
--- a/ChartsDemo/Classes/DemoListViewController.m
+++ b/ChartsDemo-iOS/Objective-C/DemoListViewController.m
@@ -33,7 +33,6 @@
 #import "LineChartTimeViewController.h"
 #import "LineChartFilledViewController.h"
 #import "HalfPieChartViewController.h"
-#import "RealmDemosViewController.h"
 
 @interface DemoListViewController () <UITableViewDataSource, UITableViewDelegate>
 
@@ -168,12 +167,6 @@ - (void)viewDidLoad
                           @"title": @"Half Pie Chart",
                           @"subtitle": @"This demonstrates how to create a 180 degree PieChart.",
                           @"class": HalfPieChartViewController.class
-                          },
-                    
-                      @{
-                          @"title": @"Realm.io database",
-                          @"subtitle": @"This demonstrates how to use this library with Realm.io mobile database.",
-                          @"class": RealmDemosViewController.class
                           }
                       ];
     //FIXME: Add TimeLineChart
diff --git a/ChartsDemo/Classes/Demos/AnotherBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/AnotherBarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/AnotherBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m
similarity index 96%
rename from ChartsDemo/Classes/Demos/AnotherBarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m
index 91168fee79..65439bc914 100644
--- a/ChartsDemo/Classes/Demos/AnotherBarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "AnotherBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface AnotherBarChartViewController () <ChartViewDelegate>
 
@@ -97,13 +97,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals;
+        [set1 replaceEntries:yVals];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"DataSet"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"DataSet"];
         set1.colors = ChartColorTemplates.vordiplom;
         set1.drawValuesEnabled = NO;
         
diff --git a/ChartsDemo/Classes/Demos/BarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/BarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/BarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m
similarity index 97%
rename from ChartsDemo/Classes/Demos/BarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m
index d134a03dcd..5e1567c088 100644
--- a/ChartsDemo/Classes/Demos/BarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "BarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 #import "DayAxisValueFormatter.h"
 
 @interface BarChartViewController () <ChartViewDelegate>
@@ -148,13 +148,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals;
+        [set1 replaceEntries: yVals];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"The year 2017"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"The year 2017"];
         [set1 setColors:ChartColorTemplates.material];
         set1.drawIconsEnabled = NO;
         
diff --git a/ChartsDemo/Classes/Demos/BubbleChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/BubbleChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/BubbleChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m
similarity index 97%
rename from ChartsDemo/Classes/Demos/BubbleChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m
index c12ad9271b..9d32596674 100644
--- a/ChartsDemo/Classes/Demos/BubbleChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "BubbleChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface BubbleChartViewController () <ChartViewDelegate>
 
@@ -115,18 +115,17 @@ - (void)setDataCount:(int)count range:(double)range
         [yVals3 addObject:[[BubbleChartDataEntry alloc] initWithX:i y:val size:size]];
     }
     
-    BubbleChartDataSet *set1 = [[BubbleChartDataSet alloc] initWithValues:yVals1 label:@"DS 1"];
+    BubbleChartDataSet *set1 = [[BubbleChartDataSet alloc] initWithEntries:yVals1 label:@"DS 1"];
     set1.drawIconsEnabled = NO;
     [set1 setColor:ChartColorTemplates.colorful[0] alpha:0.50f];
     [set1 setDrawValuesEnabled:YES];
     
-    BubbleChartDataSet *set2 = [[BubbleChartDataSet alloc] initWithValues:yVals2 label:@"DS 2"];
-    set1.drawIconsEnabled = NO;
+    BubbleChartDataSet *set2 = [[BubbleChartDataSet alloc] initWithEntries:yVals2 label:@"DS 2"];
     set2.iconsOffset = CGPointMake(0, 15);
     [set2 setColor:ChartColorTemplates.colorful[1] alpha:0.50f];
     [set2 setDrawValuesEnabled:YES];
     
-    BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithValues:yVals3 label:@"DS 3"];
+    BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithEntries:yVals3 label:@"DS 3"];
     [set3 setColor:ChartColorTemplates.colorful[2] alpha:0.50f];
     [set3 setDrawValuesEnabled:YES];
     
diff --git a/ChartsDemo/Classes/Demos/CandleStickChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/CandleStickChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/CandleStickChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m
similarity index 92%
rename from ChartsDemo/Classes/Demos/CandleStickChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m
index 2fe219de28..25a0e73ca3 100644
--- a/ChartsDemo/Classes/Demos/CandleStickChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "CandleStickChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface CandleStickChartViewController () <ChartViewDelegate>
 
@@ -41,6 +41,7 @@ - (void)viewDidLoad
                      @{@"key": @"togglePinchZoom", @"label": @"Toggle PinchZoom"},
                      @{@"key": @"toggleAutoScaleMinMax", @"label": @"Toggle auto scale min/max"},
                      @{@"key": @"toggleShadowColorSameAsCandle", @"label": @"Toggle shadow same color"},
+                     @{@"key": @"toggleShowCandleBar", @"label": @"Toggle show candle bar"},
                      @{@"key": @"toggleData", @"label": @"Toggle Data"},
                      ];
     
@@ -104,7 +105,7 @@ - (void)setDataCount:(int)count range:(double)range
         [yVals1 addObject:[[CandleChartDataEntry alloc] initWithX:i shadowH:val + high shadowL:val - low open:even ? val + open : val - open close:even ? val - close : val + close icon: [UIImage imageNamed:@"icon"]]];
     }
         
-    CandleChartDataSet *set1 = [[CandleChartDataSet alloc] initWithValues:yVals1 label:@"Data Set"];
+    CandleChartDataSet *set1 = [[CandleChartDataSet alloc] initWithEntries:yVals1 label:@"Data Set"];
     set1.axisDependency = AxisDependencyLeft;
     [set1 setColor:[UIColor colorWithWhite:80/255.f alpha:1.f]];
     
@@ -132,6 +133,15 @@ - (void)optionTapped:(NSString *)key
             set.shadowColorSameAsCandle = !set.shadowColorSameAsCandle;
         }
         
+        [_chartView notifyDataSetChanged];
+        return;
+    } else if ([key isEqualToString:@"toggleShowCandleBar"])
+    {
+        for (id<ICandleChartDataSet> set in _chartView.data.dataSets)
+        {
+            set.showCandleBar = !set.showCandleBar;
+        }
+        
         [_chartView notifyDataSetChanged];
         return;
     }
diff --git a/ChartsDemo/Classes/Demos/ColoredLineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/ColoredLineChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/ColoredLineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m
similarity index 96%
rename from ChartsDemo/Classes/Demos/ColoredLineChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m
index ee4fed4768..520770f206 100644
--- a/ChartsDemo/Classes/Demos/ColoredLineChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "ColoredLineChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface ColoredLineChartViewController () <ChartViewDelegate>
 
@@ -86,7 +86,7 @@ - (LineChartData *)dataWithCount:(int)count range:(double)range
         [yVals addObject:[[ChartDataEntry alloc] initWithX:i y:val]];
     }
     
-    LineChartDataSet *set1 = [[LineChartDataSet alloc] initWithValues:yVals label:@"DataSet 1"];
+    LineChartDataSet *set1 = [[LineChartDataSet alloc] initWithEntries:yVals label:@"DataSet 1"];
     
     set1.lineWidth = 1.75;
     set1.circleRadius = 5.0;
diff --git a/ChartsDemo/Classes/Demos/CombinedChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/CombinedChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/CombinedChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m
similarity index 94%
rename from ChartsDemo/Classes/Demos/CombinedChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m
index fa65aec940..995c419210 100644
--- a/ChartsDemo/Classes/Demos/CombinedChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "CombinedChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 #define ITEM_COUNT 12
 
@@ -170,7 +170,7 @@ - (LineChartData *)generateLineData
         [entries addObject:[[ChartDataEntry alloc] initWithX:index + 0.5 y:(arc4random_uniform(15) + 5)]];
     }
     
-    LineChartDataSet *set = [[LineChartDataSet alloc] initWithValues:entries label:@"Line DataSet"];
+    LineChartDataSet *set = [[LineChartDataSet alloc] initWithEntries:entries label:@"Line DataSet"];
     [set setColor:[UIColor colorWithRed:240/255.f green:238/255.f blue:70/255.f alpha:1.f]];
     set.lineWidth = 2.5;
     [set setCircleColor:[UIColor colorWithRed:240/255.f green:238/255.f blue:70/255.f alpha:1.f]];
@@ -202,13 +202,13 @@ - (BarChartData *)generateBarData
         [entries2 addObject:[[BarChartDataEntry alloc] initWithX:0.0 yValues:@[@(arc4random_uniform(13) + 12), @(arc4random_uniform(13) + 12)]]];
     }
 
-    BarChartDataSet *set1 = [[BarChartDataSet alloc] initWithValues:entries1 label:@"Bar 1"];
+    BarChartDataSet *set1 = [[BarChartDataSet alloc] initWithEntries:entries1 label:@"Bar 1"];
     [set1 setColor:[UIColor colorWithRed:60/255.f green:220/255.f blue:78/255.f alpha:1.f]];
     set1.valueTextColor = [UIColor colorWithRed:60/255.f green:220/255.f blue:78/255.f alpha:1.f];
     set1.valueFont = [UIFont systemFontOfSize:10.f];
-    set1.axisDependency = AxisDependencyLeft;
+    set1.axisDependency = AxisDependencyRight;
     
-    BarChartDataSet *set2 = [[BarChartDataSet alloc] initWithValues:entries2 label:@""];
+    BarChartDataSet *set2 = [[BarChartDataSet alloc] initWithEntries:entries2 label:@""];
     set2.stackLabels = @[@"Stack 1", @"Stack 2"];
     set2.colors = @[
                     [UIColor colorWithRed:61/255.f green:165/255.f blue:255/255.f alpha:1.f],
@@ -216,7 +216,7 @@ - (BarChartData *)generateBarData
                     ];
     set2.valueTextColor = [UIColor colorWithRed:61/255.f green:165/255.f blue:255/255.f alpha:1.f];
     set2.valueFont = [UIFont systemFontOfSize:10.f];
-    set2.axisDependency = AxisDependencyLeft;
+    set2.axisDependency = AxisDependencyRight;
 
     float groupSpace = 0.06f;
     float barSpace = 0.02f; // x2 dataset
@@ -243,7 +243,7 @@ - (ScatterChartData *)generateScatterData
         [entries addObject:[[ChartDataEntry alloc] initWithX:index + 0.25 y:(arc4random_uniform(10) + 55)]];
     }
     
-    ScatterChartDataSet *set = [[ScatterChartDataSet alloc] initWithValues:entries label:@"Scatter DataSet"];
+    ScatterChartDataSet *set = [[ScatterChartDataSet alloc] initWithEntries:entries label:@"Scatter DataSet"];
     set.colors = ChartColorTemplates.material;
     set.scatterShapeSize = 4.5;
     [set setDrawValuesEnabled:NO];
@@ -265,7 +265,7 @@ - (CandleChartData *)generateCandleData
         [entries addObject:[[CandleChartDataEntry alloc] initWithX:index + 1 shadowH:90.0 shadowL:70.0 open:85.0 close:75.0]];
     }
     
-    CandleChartDataSet *set = [[CandleChartDataSet alloc] initWithValues:entries label:@"Candle DataSet"];
+    CandleChartDataSet *set = [[CandleChartDataSet alloc] initWithEntries:entries label:@"Candle DataSet"];
     [set setColor:[UIColor colorWithRed:80/255.f green:80/255.f blue:80/255.f alpha:1.f]];
     set.decreasingColor = [UIColor colorWithRed:142/255.0 green:150/255.0 blue:175/255.0 alpha:1.0];
     set.shadowColor = UIColor.darkGrayColor;
@@ -290,7 +290,7 @@ - (BubbleChartData *)generateBubbleData
         [entries addObject:[[BubbleChartDataEntry alloc] initWithX:index + 0.5 y:y size:size]];
     }
     
-    BubbleChartDataSet *set = [[BubbleChartDataSet alloc] initWithValues:entries label:@"Bubble DataSet"];
+    BubbleChartDataSet *set = [[BubbleChartDataSet alloc] initWithEntries:entries label:@"Bubble DataSet"];
     [set setColors:ChartColorTemplates.vordiplom];
     set.valueTextColor = UIColor.whiteColor;
     set.valueFont = [UIFont systemFontOfSize:10.f];
diff --git a/ChartsDemo/Classes/Demos/CubicLineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/CubicLineChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/CubicLineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m
similarity index 97%
rename from ChartsDemo/Classes/Demos/CubicLineChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m
index d434898479..0d590fbf1c 100644
--- a/ChartsDemo/Classes/Demos/CubicLineChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "CubicLineChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface CubicLineSampleFillFormatter : NSObject <IChartFillFormatter>
 {
@@ -126,13 +126,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals1;
+        [set1 replaceEntries:yVals1];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:yVals1 label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:yVals1 label:@"DataSet 1"];
         set1.mode = LineChartModeCubicBezier;
         set1.cubicIntensity = 0.2;
         set1.drawCirclesEnabled = NO;
diff --git a/ChartsDemo/Classes/Demos/HalfPieChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/HalfPieChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/HalfPieChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m
similarity index 96%
rename from ChartsDemo/Classes/Demos/HalfPieChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m
index cb8ef98bb4..e66840c48e 100644
--- a/ChartsDemo/Classes/Demos/HalfPieChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "HalfPieChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface HalfPieChartViewController () <ChartViewDelegate>
 
@@ -24,7 +24,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.title = @"Half Pie Bar Chart";
+    self.title = @"Half Pie Chart";
     
     self.options = @[
                      @{@"key": @"toggleValues", @"label": @"Toggle Y-Values"},
@@ -101,7 +101,7 @@ - (void)setDataCount:(int)count range:(double)range
         [values addObject:[[PieChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + mult / 5) label:parties[i % parties.count]]];
     }
     
-    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithValues:values label:@"Election Results"];
+    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithEntries:values label:@"Election Results"];
     dataSet.sliceSpace = 3.0;
     dataSet.selectionShift = 5.0;
     
@@ -128,7 +128,7 @@ - (void)optionTapped:(NSString *)key
 {
     if ([key isEqualToString:@"toggleXValues"])
     {
-        _chartView.drawSliceTextEnabled = !_chartView.isDrawSliceTextEnabled;
+        _chartView.drawEntryLabelsEnabled = !_chartView.drawEntryLabelsEnabled;
         
         [_chartView setNeedsDisplay];
         return;
diff --git a/ChartsDemo/Classes/Demos/HorizontalBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/HorizontalBarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/HorizontalBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m
similarity index 97%
rename from ChartsDemo/Classes/Demos/HorizontalBarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m
index dac6e26e07..54899281f1 100644
--- a/ChartsDemo/Classes/Demos/HorizontalBarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "HorizontalBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface HorizontalBarChartViewController () <ChartViewDelegate>
 
@@ -127,13 +127,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals;
+        [set1 replaceEntries:yVals];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"DataSet"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"DataSet"];
         
         set1.drawIconsEnabled = NO;
         
diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/LineChart1ViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h
diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m
similarity index 92%
rename from ChartsDemo/Classes/Demos/LineChart1ViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m
index 15fd13a2ac..40297febdb 100644
--- a/ChartsDemo/Classes/Demos/LineChart1ViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "LineChart1ViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface LineChart1ViewController () <ChartViewDelegate>
 
@@ -61,7 +61,7 @@ - (void)viewDidLoad
     ChartLimitLine *llXAxis = [[ChartLimitLine alloc] initWithLimit:10.0 label:@"Index 10"];
     llXAxis.lineWidth = 4.0;
     llXAxis.lineDashLengths = @[@(10.f), @(10.f), @(0.f)];
-    llXAxis.labelPosition = ChartLimitLabelPositionRightBottom;
+    llXAxis.labelPosition = ChartLimitLabelPositionBottomRight;
     llXAxis.valueFont = [UIFont systemFontOfSize:10.f];
     
     //[_chartView.xAxis addLimitLine:llXAxis];
@@ -72,13 +72,13 @@ - (void)viewDidLoad
     ChartLimitLine *ll1 = [[ChartLimitLine alloc] initWithLimit:150.0 label:@"Upper Limit"];
     ll1.lineWidth = 4.0;
     ll1.lineDashLengths = @[@5.f, @5.f];
-    ll1.labelPosition = ChartLimitLabelPositionRightTop;
+    ll1.labelPosition = ChartLimitLabelPositionTopRight;
     ll1.valueFont = [UIFont systemFontOfSize:10.0];
     
     ChartLimitLine *ll2 = [[ChartLimitLine alloc] initWithLimit:-30.0 label:@"Lower Limit"];
     ll2.lineWidth = 4.0;
     ll2.lineDashLengths = @[@5.f, @5.f];
-    ll2.labelPosition = ChartLimitLabelPositionRightBottom;
+    ll2.labelPosition = ChartLimitLabelPositionBottomRight;
     ll2.valueFont = [UIFont systemFontOfSize:10.0];
     
     ChartYAxis *leftAxis = _chartView.leftAxis;
@@ -145,13 +145,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = values;
+        [set1 replaceEntries: values];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:values label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:values label:@"DataSet 1"];
         
         set1.drawIconsEnabled = NO;
         
@@ -227,7 +227,14 @@ - (void)optionTapped:(NSString *)key
     {
         for (id<ILineChartDataSet> set in _chartView.data.dataSets)
         {
-            set.drawSteppedEnabled = !set.isDrawSteppedEnabled;
+            switch (set.mode) {
+                case LineChartModeLinear:
+                case LineChartModeCubicBezier:
+                case LineChartModeHorizontalBezier:
+                    set.mode = LineChartModeStepped;
+                    break;
+                case LineChartModeStepped: set.mode = LineChartModeLinear;
+            }
         }
 
         [_chartView setNeedsDisplay];
diff --git a/ChartsDemo/Classes/Demos/LineChart2ViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/LineChart2ViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h
diff --git a/ChartsDemo/Classes/Demos/LineChart2ViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m
similarity index 92%
rename from ChartsDemo/Classes/Demos/LineChart2ViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m
index d1996ba77e..75eceadef6 100644
--- a/ChartsDemo/Classes/Demos/LineChart2ViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "LineChart2ViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface LineChart2ViewController () <ChartViewDelegate>
 
@@ -146,15 +146,15 @@ - (void)setDataCount:(int)count range:(double)range
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
         set2 = (LineChartDataSet *)_chartView.data.dataSets[1];
         set3 = (LineChartDataSet *)_chartView.data.dataSets[2];
-        set1.values = yVals1;
-        set2.values = yVals2;
-        set3.values = yVals3;
+        [set1 replaceEntries:yVals1];
+        [set2 replaceEntries:yVals2];
+        [set3 replaceEntries:yVals3];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:yVals1 label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:yVals1 label:@"DataSet 1"];
         set1.axisDependency = AxisDependencyLeft;
         [set1 setColor:[UIColor colorWithRed:51/255.f green:181/255.f blue:229/255.f alpha:1.f]];
         [set1 setCircleColor:UIColor.whiteColor];
@@ -165,7 +165,7 @@ - (void)setDataCount:(int)count range:(double)range
         set1.highlightColor = [UIColor colorWithRed:244/255.f green:117/255.f blue:117/255.f alpha:1.f];
         set1.drawCircleHoleEnabled = NO;
         
-        set2 = [[LineChartDataSet alloc] initWithValues:yVals2 label:@"DataSet 2"];
+        set2 = [[LineChartDataSet alloc] initWithEntries:yVals2 label:@"DataSet 2"];
         set2.axisDependency = AxisDependencyRight;
         [set2 setColor:UIColor.redColor];
         [set2 setCircleColor:UIColor.whiteColor];
@@ -176,7 +176,7 @@ - (void)setDataCount:(int)count range:(double)range
         set2.highlightColor = [UIColor colorWithRed:244/255.f green:117/255.f blue:117/255.f alpha:1.f];
         set2.drawCircleHoleEnabled = NO;
         
-        set3 = [[LineChartDataSet alloc] initWithValues:yVals3 label:@"DataSet 3"];
+        set3 = [[LineChartDataSet alloc] initWithEntries:yVals3 label:@"DataSet 3"];
         set3.axisDependency = AxisDependencyRight;
         [set3 setColor:UIColor.yellowColor];
         [set3 setCircleColor:UIColor.whiteColor];
@@ -239,7 +239,14 @@ - (void)optionTapped:(NSString *)key
     {
         for (id<ILineChartDataSet> set in _chartView.data.dataSets)
         {
-            set.drawSteppedEnabled = !set.isDrawSteppedEnabled;
+            switch (set.mode) {
+                case LineChartModeLinear:
+                case LineChartModeCubicBezier:
+                case LineChartModeHorizontalBezier:
+                    set.mode = LineChartModeStepped;
+                    break;
+                case LineChartModeStepped: set.mode = LineChartModeLinear;
+            }
         }
 
         [_chartView setNeedsDisplay];
diff --git a/ChartsDemo/Classes/Demos/LineChartFilledViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/LineChartFilledViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h
diff --git a/ChartsDemo/Classes/Demos/LineChartFilledViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m
similarity index 93%
rename from ChartsDemo/Classes/Demos/LineChartFilledViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m
index c78a043b30..f6ec793465 100644
--- a/ChartsDemo/Classes/Demos/LineChartFilledViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "LineChartFilledViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface LineChartFilledViewController () <ChartViewDelegate>
 
@@ -105,14 +105,14 @@ - (void)setDataCount:(int)count range:(double)range
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
         set2 = (LineChartDataSet *)_chartView.data.dataSets[1];
-        set1.values = yVals1;
-        set2.values = yVals2;
+        [set1 replaceEntries:yVals1];
+        [set2 replaceEntries:yVals2];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:yVals1 label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:yVals1 label:@"DataSet 1"];
         set1.axisDependency = AxisDependencyLeft;
         [set1 setColor:[UIColor colorWithRed:255/255.0 green:241/255.0 blue:46/255.0 alpha:1.0]];
         set1.drawCirclesEnabled = NO;
@@ -124,10 +124,10 @@ - (void)setDataCount:(int)count range:(double)range
         set1.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0];
         set1.drawCircleHoleEnabled = NO;
         set1.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id<ILineChartDataSet>  _Nonnull dataSet, id<LineChartDataProvider>  _Nonnull dataProvider) {
-            return _chartView.leftAxis.axisMinimum;
+            return self.chartView.leftAxis.axisMinimum;
         }];
         
-        set2 = [[LineChartDataSet alloc] initWithValues:yVals2 label:@"DataSet 2"];
+        set2 = [[LineChartDataSet alloc] initWithEntries:yVals2 label:@"DataSet 2"];
         set2.axisDependency = AxisDependencyLeft;
         [set2 setColor:[UIColor colorWithRed:255/255.0 green:241/255.0 blue:46/255.0 alpha:1.0]];
         set2.drawCirclesEnabled = NO;
@@ -139,7 +139,7 @@ - (void)setDataCount:(int)count range:(double)range
         set2.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0];
         set2.drawCircleHoleEnabled = NO;
         set2.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id<ILineChartDataSet>  _Nonnull dataSet, id<LineChartDataProvider>  _Nonnull dataProvider) {
-            return _chartView.leftAxis.axisMaximum;
+            return self.chartView.leftAxis.axisMaximum;
         }];
         
         NSMutableArray *dataSets = [[NSMutableArray alloc] init];
diff --git a/ChartsDemo/Classes/Demos/LineChartTimeViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/LineChartTimeViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h
diff --git a/ChartsDemo/Classes/Demos/LineChartTimeViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m
similarity index 93%
rename from ChartsDemo/Classes/Demos/LineChartTimeViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m
index 12667ea96f..06e6808f4f 100644
--- a/ChartsDemo/Classes/Demos/LineChartTimeViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "LineChartTimeViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 #import "DateValueFormatter.h"
 
 @interface LineChartTimeViewController () <ChartViewDelegate>
@@ -126,13 +126,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = values;
+        [set1 replaceEntries: values];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[LineChartDataSet alloc] initWithValues:values label:@"DataSet 1"];
+        set1 = [[LineChartDataSet alloc] initWithEntries:values label:@"DataSet 1"];
         set1.axisDependency = AxisDependencyLeft;
         set1.valueTextColor = [UIColor colorWithRed:51/255.0 green:181/255.0 blue:229/255.0 alpha:1.0];
         set1.lineWidth = 1.5;
@@ -193,7 +193,14 @@ - (void)optionTapped:(NSString *)key
     {
         for (id<ILineChartDataSet> set in _chartView.data.dataSets)
         {
-            set.drawSteppedEnabled = !set.isDrawSteppedEnabled;
+            switch (set.mode) {
+                case LineChartModeLinear:
+                case LineChartModeCubicBezier:
+                case LineChartModeHorizontalBezier:
+                    set.mode = LineChartModeStepped;
+                    break;
+                case LineChartModeStepped: set.mode = LineChartModeLinear;
+            }
         }
 
         [_chartView setNeedsDisplay];
diff --git a/ChartsDemo/Classes/Demos/MultipleBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/MultipleBarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/MultipleBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m
similarity index 94%
rename from ChartsDemo/Classes/Demos/MultipleBarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m
index b4157afb86..ec748b8d24 100644
--- a/ChartsDemo/Classes/Demos/MultipleBarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "MultipleBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 #import "IntAxisValueFormatter.h"
 
 @interface MultipleBarChartViewController () <ChartViewDelegate>
@@ -155,10 +155,10 @@ - (void)setDataCount:(int)count range:(double)range
         set2 = (BarChartDataSet *)_chartView.data.dataSets[1];
         set3 = (BarChartDataSet *)_chartView.data.dataSets[2];
         set4 = (BarChartDataSet *)_chartView.data.dataSets[3];
-        set1.values = yVals1;
-        set2.values = yVals2;
-        set3.values = yVals3;
-        set4.values = yVals4;
+        [set1 replaceEntries:yVals1];
+        [set2 replaceEntries:yVals2];
+        [set3 replaceEntries:yVals3];
+        [set4 replaceEntries:yVals4];
         
         BarChartData *data = _chartView.barData;
         
@@ -171,16 +171,16 @@ - (void)setDataCount:(int)count range:(double)range
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals1 label:@"Company A"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals1 label:@"Company A"];
         [set1 setColor:[UIColor colorWithRed:104/255.f green:241/255.f blue:175/255.f alpha:1.f]];
         
-        set2 = [[BarChartDataSet alloc] initWithValues:yVals2 label:@"Company B"];
+        set2 = [[BarChartDataSet alloc] initWithEntries:yVals2 label:@"Company B"];
         [set2 setColor:[UIColor colorWithRed:164/255.f green:228/255.f blue:251/255.f alpha:1.f]];
         
-        set3 = [[BarChartDataSet alloc] initWithValues:yVals3 label:@"Company C"];
+        set3 = [[BarChartDataSet alloc] initWithEntries:yVals3 label:@"Company C"];
         [set3 setColor:[UIColor colorWithRed:242/255.f green:247/255.f blue:158/255.f alpha:1.f]];
         
-        set4 = [[BarChartDataSet alloc] initWithValues:yVals4 label:@"Company D"];
+        set4 = [[BarChartDataSet alloc] initWithEntries:yVals4 label:@"Company D"];
         [set4 setColor:[UIColor colorWithRed:255/255.f green:102/255.f blue:0/255.f alpha:1.f]];
         
         NSMutableArray *dataSets = [[NSMutableArray alloc] init];
diff --git a/ChartsDemo/Classes/Demos/MultipleLinesChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/MultipleLinesChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/MultipleLinesChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m
similarity index 93%
rename from ChartsDemo/Classes/Demos/MultipleLinesChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m
index dcb18cd7df..358a7e21eb 100644
--- a/ChartsDemo/Classes/Demos/MultipleLinesChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "MultipleLinesChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface MultipleLinesChartViewController () <ChartViewDelegate>
 
@@ -106,7 +106,7 @@ - (void)setDataCount:(int)count range:(double)range
             [values addObject:[[ChartDataEntry alloc] initWithX:i y:val]];
         }
         
-        LineChartDataSet *d = [[LineChartDataSet alloc] initWithValues:values label:[NSString stringWithFormat:@"DataSet %d", z + 1]];
+        LineChartDataSet *d = [[LineChartDataSet alloc] initWithEntries:values label:[NSString stringWithFormat:@"DataSet %d", z + 1]];
         d.lineWidth = 2.5;
         d.circleRadius = 4.0;
         d.circleHoleRadius = 2.0;
@@ -165,7 +165,14 @@ - (void)optionTapped:(NSString *)key
     {
         for (id<ILineChartDataSet> set in _chartView.data.dataSets)
         {
-            set.drawSteppedEnabled = !set.isDrawSteppedEnabled;
+            switch (set.mode) {
+                case LineChartModeLinear:
+                case LineChartModeCubicBezier:
+                case LineChartModeHorizontalBezier:
+                    set.mode = LineChartModeStepped;
+                    break;
+                case LineChartModeStepped: set.mode = LineChartModeLinear;
+            }
         }
 
         [_chartView setNeedsDisplay];
diff --git a/ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m
similarity index 97%
rename from ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m
index da934ad7b7..b87ef62a13 100644
--- a/ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "NegativeStackedBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface NegativeStackedBarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
 
@@ -124,7 +124,7 @@ - (void)setChartData
     if (_chartView.data.dataSetCount > 0)
     {
         set = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set.values = yValues;
+        [set replaceEntries: yValues];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
@@ -137,7 +137,7 @@ - (void)setChartData
         customFormatter.minimumSignificantDigits = 1;
         customFormatter.minimumFractionDigits = 1;
         
-        set = [[BarChartDataSet alloc] initWithValues:yValues label:@"Age Distribution"];
+        set = [[BarChartDataSet alloc] initWithEntries:yValues label:@"Age Distribution"];
         
         set.drawIconsEnabled = NO;
         
diff --git a/ChartsDemo/Classes/Demos/PieChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/PieChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/PieChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m
similarity index 97%
rename from ChartsDemo/Classes/Demos/PieChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m
index 0799e4640e..5bc3a9d665 100644
--- a/ChartsDemo/Classes/Demos/PieChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "PieChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface PieChartViewController () <ChartViewDelegate>
 
@@ -28,7 +28,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.title = @"Pie Bar Chart";
+    self.title = @"Pie Chart";
     
     self.options = @[
                      @{@"key": @"toggleValues", @"label": @"Toggle Y-Values"},
@@ -97,7 +97,7 @@ - (void)setDataCount:(int)count range:(double)range
         [values addObject:[[PieChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + mult / 5) label:parties[i % parties.count] icon: [UIImage imageNamed:@"icon"]]];
     }
     
-    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithValues:values label:@"Election Results"];
+    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithEntries:values label:@"Election Results"];
     
     dataSet.drawIconsEnabled = NO;
     
@@ -135,7 +135,7 @@ - (void)optionTapped:(NSString *)key
 {
     if ([key isEqualToString:@"toggleXValues"])
     {
-        _chartView.drawSliceTextEnabled = !_chartView.isDrawSliceTextEnabled;
+        _chartView.drawEntryLabelsEnabled = !_chartView.drawEntryLabelsEnabled;
         
         [_chartView setNeedsDisplay];
         return;
diff --git a/ChartsDemo/Classes/Demos/PiePolylineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/PiePolylineChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/PiePolylineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m
similarity index 98%
rename from ChartsDemo/Classes/Demos/PiePolylineChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m
index f68658f296..81f092e9be 100644
--- a/ChartsDemo/Classes/Demos/PiePolylineChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m
@@ -7,7 +7,7 @@
 //
 
 #import "PiePolylineChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface PiePolylineChartViewController () <ChartViewDelegate>
 
@@ -24,7 +24,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.title = @"Pie Bar Chart";
+    self.title = @"Pie Poly Line Chart";
     
     self.options = @[
                      @{@"key": @"toggleValues", @"label": @"Toggle Y-Values"},
@@ -82,7 +82,7 @@ - (void)setDataCount:(int)count range:(double)range
         [entries addObject:[[PieChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + mult / 5) label:parties[i % parties.count]]];
     }
     
-    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithValues:entries label:@"Election Results"];
+    PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithEntries:entries label:@"Election Results"];
     dataSet.sliceSpace = 2.0;
     
     // add a lot of colors
diff --git a/ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m
similarity index 98%
rename from ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m
index 4a048dab65..2440fe9e1a 100644
--- a/ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "PositiveNegativeBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface PositiveNegativeBarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
 {
@@ -27,7 +27,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.title = @"Bar Chart";
+    self.title = @"Positive/Negative Bar Chart";
     
     self.options = @[
                      @{@"key": @"toggleValues", @"label": @"Toggle Values"},
@@ -149,7 +149,7 @@ - (void)setChartData
         }
     }
     
-    BarChartDataSet *set = set = [[BarChartDataSet alloc] initWithValues:values label:@"Values"];
+    BarChartDataSet *set = set = [[BarChartDataSet alloc] initWithEntries:values label:@"Values"];
     set.colors = colors;
     set.valueColors = colors;
     
diff --git a/ChartsDemo/Classes/Demos/RadarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/RadarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/RadarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m
similarity index 89%
rename from ChartsDemo/Classes/Demos/RadarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m
index 1810924a86..24cfea5b58 100644
--- a/ChartsDemo/Classes/Demos/RadarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m
@@ -10,17 +10,15 @@
 //
 
 #import "RadarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface RadarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
-{
-    NSArray<NSString *> *activities;
-    UIColor *originalBarBgColor;
-    UIColor *originalBarTintColor;
-    UIBarStyle originalBarStyle;
-}
 
 @property (nonatomic, strong) IBOutlet RadarChartView *chartView;
+@property (nonatomic, strong) NSArray<NSString *> *activities;
+@property (nonatomic, strong) UIColor *originalBarBgColor;
+@property (nonatomic, strong) UIColor *originalBarTintColor;
+@property (nonatomic) UIBarStyle originalBarStyle;
 
 @end
 
@@ -30,9 +28,9 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    activities = @[ @"Burger", @"Steak", @"Salad", @"Pasta", @"Pizza" ];
+    self.activities = @[ @"Burger", @"Steak", @"Salad", @"Pasta", @"Pizza" ];
     
-    self.title = @"Radar Bar Chart";
+    self.title = @"Radar Chart";
     
     self.options = @[
                      @{@"key": @"toggleValues", @"label": @"Toggle Values"},
@@ -59,7 +57,7 @@ - (void)viewDidLoad
     _chartView.innerWebColor = UIColor.lightGrayColor;
     _chartView.webAlpha = 1.0;
     
-    RadarMarkerView *marker = (RadarMarkerView *)[RadarMarkerView viewFromXib];
+    RadarMarkerView *marker = (RadarMarkerView *)[RadarMarkerView viewFromXibIn:[NSBundle mainBundle]];
     marker.chartView = _chartView;
     _chartView.marker = marker;
     
@@ -98,9 +96,9 @@ - (void)viewWillAppear:(BOOL)animated
     
     [UIView animateWithDuration:0.15 animations:^{
         UINavigationBar *navigationBar = self.navigationController.navigationBar;
-        originalBarBgColor = self.navigationController.navigationBar.barTintColor;
-        originalBarTintColor = self.navigationController.navigationBar.tintColor;
-        originalBarStyle = self.navigationController.navigationBar.barStyle;
+        self.originalBarBgColor = navigationBar.barTintColor;
+        self.originalBarTintColor = navigationBar.tintColor;
+        self.originalBarStyle = navigationBar.barStyle;
         
         navigationBar.barTintColor = self.view.backgroundColor;
         navigationBar.tintColor = UIColor.whiteColor;
@@ -114,9 +112,9 @@ - (void)viewWillDisappear:(BOOL)animated
     
     [UIView animateWithDuration:0.15 animations:^{
         UINavigationBar *navigationBar = self.navigationController.navigationBar;
-        navigationBar.barTintColor = originalBarBgColor;
-        navigationBar.tintColor = originalBarTintColor;
-        navigationBar.barStyle = originalBarStyle;
+        navigationBar.barTintColor = self.originalBarBgColor;
+        navigationBar.tintColor = self.originalBarTintColor;
+        navigationBar.barStyle = self.originalBarStyle;
     }];
 }
 
@@ -153,7 +151,7 @@ - (void)setChartData
         [entries2 addObject:[[RadarChartDataEntry alloc] initWithValue:(arc4random_uniform(mult) + min)]];
     }
     
-    RadarChartDataSet *set1 = [[RadarChartDataSet alloc] initWithValues:entries1 label:@"Last Week"];
+    RadarChartDataSet *set1 = [[RadarChartDataSet alloc] initWithEntries:entries1 label:@"Last Week"];
     [set1 setColor:[UIColor colorWithRed:103/255.0 green:110/255.0 blue:129/255.0 alpha:1.0]];
     set1.fillColor = [UIColor colorWithRed:103/255.0 green:110/255.0 blue:129/255.0 alpha:1.0];
     set1.drawFilledEnabled = YES;
@@ -162,7 +160,7 @@ - (void)setChartData
     set1.drawHighlightCircleEnabled = YES;
     [set1 setDrawHighlightIndicators:NO];
 
-    RadarChartDataSet *set2 = [[RadarChartDataSet alloc] initWithValues:entries2 label:@"This Week"];
+    RadarChartDataSet *set2 = [[RadarChartDataSet alloc] initWithEntries:entries2 label:@"This Week"];
     [set2 setColor:[UIColor colorWithRed:121/255.0 green:162/255.0 blue:175/255.0 alpha:1.0]];
     set2.fillColor = [UIColor colorWithRed:121/255.0 green:162/255.0 blue:175/255.0 alpha:1.0];
     set2.drawFilledEnabled = YES;
@@ -270,7 +268,7 @@ - (void)chartValueNothingSelected:(ChartViewBase * __nonnull)chartView
 - (NSString *)stringForValue:(double)value
                         axis:(ChartAxisBase *)axis
 {
-    return activities[(int) value % activities.count];
+    return self.activities[(int) value % self.activities.count];
 }
 
 @end
diff --git a/ChartsDemo/Classes/Demos/ScatterChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/ScatterChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/ScatterChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m
similarity index 96%
rename from ChartsDemo/Classes/Demos/ScatterChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m
index 177ba28fb7..19a158f640 100644
--- a/ChartsDemo/Classes/Demos/ScatterChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "ScatterChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface ScatterChartViewController () <ChartViewDelegate>
 
@@ -28,7 +28,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.title = @"Scatter Bar Chart";
+    self.title = @"Scatter Chart";
     
     self.options = @[
                      @{@"key": @"toggleValues", @"label": @"Toggle Values"},
@@ -110,15 +110,15 @@ - (void)setDataCount:(int)count range:(double)range
         [yVals3 addObject:[[ChartDataEntry alloc] initWithX:(double)i + 0.66 y:val]];
     }
     
-    ScatterChartDataSet *set1 = [[ScatterChartDataSet alloc] initWithValues:yVals1 label:@"DS 1"];
+    ScatterChartDataSet *set1 = [[ScatterChartDataSet alloc] initWithEntries:yVals1 label:@"DS 1"];
     [set1 setScatterShape:ScatterShapeSquare];
     [set1 setColor:ChartColorTemplates.colorful[0]];
-    ScatterChartDataSet *set2 = [[ScatterChartDataSet alloc] initWithValues:yVals2 label:@"DS 2"];
+    ScatterChartDataSet *set2 = [[ScatterChartDataSet alloc] initWithEntries:yVals2 label:@"DS 2"];
     [set2 setScatterShape:ScatterShapeCircle];
     set2.scatterShapeHoleColor = ChartColorTemplates.colorful[3];
     set2.scatterShapeHoleRadius = 3.5f;
     [set2 setColor:ChartColorTemplates.colorful[1]];
-    ScatterChartDataSet *set3 = [[ScatterChartDataSet alloc] initWithValues:yVals3 label:@"DS 3"];
+    ScatterChartDataSet *set3 = [[ScatterChartDataSet alloc] initWithEntries:yVals3 label:@"DS 3"];
     [set3 setScatterShape:ScatterShapeCross];
     [set3 setColor:ChartColorTemplates.colorful[2]];
     
diff --git a/ChartsDemo/Classes/Demos/SinusBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/SinusBarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/SinusBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m
similarity index 96%
rename from ChartsDemo/Classes/Demos/SinusBarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m
index 708aa727ad..e64bf3388b 100644
--- a/ChartsDemo/Classes/Demos/SinusBarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "SinusBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface SinusBarChartViewController () <ChartViewDelegate>
 
@@ -118,13 +118,13 @@ - (void)setDataCount:(int)count
     if (_chartView.data.dataSetCount > 0)
     {
         set = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set.values = entries;
+        [set replaceEntries: entries];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set = [[BarChartDataSet alloc] initWithValues:entries label:@"Sinus Function"];
+        set = [[BarChartDataSet alloc] initWithEntries:entries label:@"Sinus Function"];
         [set setColor:[UIColor colorWithRed:240/255.f green:120/255.f blue:124/255.f alpha:1.f]];
         
         BarChartData *data = [[BarChartData alloc] initWithDataSet:set];
diff --git a/ChartsDemo/Classes/Demos/StackedBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h
similarity index 100%
rename from ChartsDemo/Classes/Demos/StackedBarChartViewController.h
rename to ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h
diff --git a/ChartsDemo/Classes/Demos/StackedBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m
similarity index 97%
rename from ChartsDemo/Classes/Demos/StackedBarChartViewController.m
rename to ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m
index 2f3e728132..69fb1053bf 100644
--- a/ChartsDemo/Classes/Demos/StackedBarChartViewController.m
+++ b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m
@@ -10,7 +10,7 @@
 //
 
 #import "StackedBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface StackedBarChartViewController () <ChartViewDelegate>
 
@@ -119,13 +119,13 @@ - (void)setDataCount:(int)count range:(double)range
     if (_chartView.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
-        set1.values = yVals;
+        [set1 replaceEntries: yVals];
         [_chartView.data notifyDataChanged];
         [_chartView notifyDataSetChanged];
     }
     else
     {
-        set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@"Statistics Vienna 2014"];
+        set1 = [[BarChartDataSet alloc] initWithEntries:yVals label:@"Statistics Vienna 2014"];
         
         set1.drawIconsEnabled = NO;
         
diff --git a/ChartsDemo/Classes/Formatters/DateValueFormatter.h b/ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h
similarity index 90%
rename from ChartsDemo/Classes/Formatters/DateValueFormatter.h
rename to ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h
index 71ba11d021..2e94536aa7 100644
--- a/ChartsDemo/Classes/Formatters/DateValueFormatter.h
+++ b/ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h
@@ -10,7 +10,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface DateValueFormatter : NSObject <IChartAxisValueFormatter>
 
diff --git a/ChartsDemo/Classes/Formatters/DateValueFormatter.m b/ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.m
similarity index 100%
rename from ChartsDemo/Classes/Formatters/DateValueFormatter.m
rename to ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.m
diff --git a/ChartsDemo/Classes/Formatters/DayAxisValueFormatter.h b/ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h
similarity index 88%
rename from ChartsDemo/Classes/Formatters/DayAxisValueFormatter.h
rename to ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h
index 117e8c8de1..4de193d0c5 100644
--- a/ChartsDemo/Classes/Formatters/DayAxisValueFormatter.h
+++ b/ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h
@@ -5,7 +5,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface DayAxisValueFormatter : NSObject <IChartAxisValueFormatter>
 
diff --git a/ChartsDemo/Classes/Formatters/DayAxisValueFormatter.m b/ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.m
similarity index 100%
rename from ChartsDemo/Classes/Formatters/DayAxisValueFormatter.m
rename to ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.m
diff --git a/ChartsDemo/Classes/Formatters/IntAxisValueFormatter.h b/ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h
similarity index 85%
rename from ChartsDemo/Classes/Formatters/IntAxisValueFormatter.h
rename to ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h
index 746cc21565..6401ed07d4 100644
--- a/ChartsDemo/Classes/Formatters/IntAxisValueFormatter.h
+++ b/ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h
@@ -5,7 +5,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface IntAxisValueFormatter : NSObject <IChartAxisValueFormatter>
 
diff --git a/ChartsDemo/Classes/Formatters/IntAxisValueFormatter.m b/ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.m
similarity index 100%
rename from ChartsDemo/Classes/Formatters/IntAxisValueFormatter.m
rename to ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.m
diff --git a/ChartsDemo/Classes/Formatters/LargeValueFormatter.swift b/ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift
similarity index 91%
rename from ChartsDemo/Classes/Formatters/LargeValueFormatter.swift
rename to ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift
index 7f02bd40e3..47ca78fd5e 100644
--- a/ChartsDemo/Classes/Formatters/LargeValueFormatter.swift
+++ b/ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift
@@ -14,17 +14,17 @@ open class LargeValueFormatter: NSObject, IValueFormatter, IAxisValueFormatter
     /// Suffix to be appended after the values.
     ///
     /// **default**: suffix: ["", "k", "m", "b", "t"]
-    open var suffix = ["", "k", "m", "b", "t"]
+    @objc open var suffix = ["", "k", "m", "b", "t"]
     
     /// An appendix text to be added at the end of the formatted value.
-    open var appendix: String?
+    @objc open var appendix: String?
     
     public override init()
     {
         
     }
     
-    public init(appendix: String?)
+    @objc public init(appendix: String?)
     {
         self.appendix = appendix
     }
diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 87%
rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
index fe9ab4226e..7c780dbcb5 100644
--- a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -45,10 +45,16 @@
       "idiom" : "iphone",
       "filename" : "Icon-60@3x.png",
       "scale" : "3x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "iTunesArtwork@2x.png",
+      "scale" : "1x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
\ No newline at end of file
+}
diff --git a/ChartsDemo/Resources/app-icon/Icon-29@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png
similarity index 100%
rename from ChartsDemo/Resources/app-icon/Icon-29@2x.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png
diff --git a/ChartsDemo/Resources/app-icon/Icon-29@3x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png
similarity index 100%
rename from ChartsDemo/Resources/app-icon/Icon-29@3x.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png
diff --git a/ChartsDemo/Resources/app-icon/Icon-40@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
similarity index 100%
rename from ChartsDemo/Resources/app-icon/Icon-40@2x.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
diff --git a/ChartsDemo/Resources/app-icon/Icon-40@3x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
similarity index 100%
rename from ChartsDemo/Resources/app-icon/Icon-40@3x.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
diff --git a/ChartsDemo/Resources/app-icon/Icon-60@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
similarity index 100%
rename from ChartsDemo/Resources/app-icon/Icon-60@2x.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
diff --git a/ChartsDemo/Resources/app-icon/Icon-60@3x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
similarity index 100%
rename from ChartsDemo/Resources/app-icon/Icon-60@3x.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
diff --git a/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
new file mode 100644
index 0000000000..808316d631
Binary files /dev/null and b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png differ
diff --git a/ChartsDemo/Resources/Images.xcassets/Contents.json b/ChartsDemo-iOS/Resources/Images.xcassets/Contents.json
similarity index 100%
rename from ChartsDemo/Resources/Images.xcassets/Contents.json
rename to ChartsDemo-iOS/Resources/Images.xcassets/Contents.json
diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/Contents.json b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/Contents.json
similarity index 100%
rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/Contents.json
rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/Contents.json
diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/star-1.png b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-1.png
similarity index 100%
rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/star-1.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-1.png
diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/star-2.png b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-2.png
similarity index 100%
rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/star-2.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-2.png
diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/star.png b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star.png
similarity index 100%
rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/star.png
rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star.png
diff --git a/ChartsDemo-iOS/Resources/Launch Screen.storyboard b/ChartsDemo-iOS/Resources/Launch Screen.storyboard
new file mode 100644
index 0000000000..c9e454f2e2
--- /dev/null
+++ b/ChartsDemo-iOS/Resources/Launch Screen.storyboard	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2017 dcg. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                                <rect key="frame" x="0.0" y="626.5" width="375" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ChartsDemo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                                <rect key="frame" x="0.0" y="202" width="375" height="43"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="8Hx-Yn-UEU" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+                            <constraint firstItem="8Hx-Yn-UEU" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="8Hx-Yn-UEU" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="8Hx-Yn-UEU" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="8Hx-Yn-UEU"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/ChartsDemo/Resources/markers/radar_marker@3x.png b/ChartsDemo-iOS/Resources/markers/radar_marker@3x.png
similarity index 100%
rename from ChartsDemo/Resources/markers/radar_marker@3x.png
rename to ChartsDemo-iOS/Resources/markers/radar_marker@3x.png
diff --git a/ChartsDemo/Supporting Files/ChartsDemo-Bridging-Header.h b/ChartsDemo-iOS/Supporting Files/ChartsDemo-Bridging-Header.h
similarity index 100%
rename from ChartsDemo/Supporting Files/ChartsDemo-Bridging-Header.h
rename to ChartsDemo-iOS/Supporting Files/ChartsDemo-Bridging-Header.h
diff --git a/ChartsDemo/Supporting Files/Info.plist b/ChartsDemo-iOS/Supporting Files/Info.plist
similarity index 85%
rename from ChartsDemo/Supporting Files/Info.plist
rename to ChartsDemo-iOS/Supporting Files/Info.plist
index 4a1b14c07a..6e4887eb4c 100644
--- a/ChartsDemo/Supporting Files/Info.plist	
+++ b/ChartsDemo-iOS/Supporting Files/Info.plist	
@@ -22,6 +22,12 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>This app requires access to the photo library to store shots of charts there.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app requires access to the photo library to store shots of charts there.</string>
+	<key>UILaunchStoryboardName</key>
+	<string>Launch Screen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -32,7 +38,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>This app requires access to the photo library to store shots of charts there.</string>
 </dict>
 </plist>
diff --git a/ChartsDemo/Supporting Files/main.m b/ChartsDemo-iOS/Supporting Files/main.m
similarity index 100%
rename from ChartsDemo/Supporting Files/main.m
rename to ChartsDemo-iOS/Supporting Files/main.m
diff --git a/ChartsDemo-iOS/Swift/AppDelegate.swift b/ChartsDemo-iOS/Swift/AppDelegate.swift
new file mode 100644
index 0000000000..ff723e6872
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/AppDelegate.swift
@@ -0,0 +1,56 @@
+//
+//  AppDelegate.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-03.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        self.window = UIWindow(frame: UIScreen.main.bounds)
+        
+        
+        let vc = DemoListViewController()
+        let nav = UINavigationController(rootViewController: vc)
+        
+        window?.rootViewController = nav
+        window?.makeKeyAndVisible()
+        
+        return true
+    }
+
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+
+}
+
diff --git a/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift b/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift
new file mode 100644
index 0000000000..8f7f09f3ab
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift
@@ -0,0 +1,30 @@
+//
+//  RadarMarkerView.swift
+//  ChartsDemo
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+import Foundation
+import Charts
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+public class RadarMarkerView: MarkerView {
+    @IBOutlet var label: UILabel!
+    
+    public override func awakeFromNib() {
+        self.offset.x = -self.frame.size.width / 2.0
+        self.offset.y = -self.frame.size.height - 7.0
+    }
+    
+    public override func refreshContent(entry: ChartDataEntry, highlight: Highlight) {
+        label.text = String.init(format: "%d %%", Int(round(entry.y)))
+        layoutIfNeeded()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift b/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift
new file mode 100644
index 0000000000..9fd1174bc9
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift
@@ -0,0 +1,35 @@
+//
+//  XYMarkerView.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+import Foundation
+import Charts
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+public class XYMarkerView: BalloonMarker {
+    public var xAxisValueFormatter: IAxisValueFormatter
+    fileprivate var yFormatter = NumberFormatter()
+    
+    public init(color: UIColor, font: UIFont, textColor: UIColor, insets: UIEdgeInsets,
+                xAxisValueFormatter: IAxisValueFormatter) {
+        self.xAxisValueFormatter = xAxisValueFormatter
+        yFormatter.minimumFractionDigits = 1
+        yFormatter.maximumFractionDigits = 1
+        super.init(color: color, font: font, textColor: textColor, insets: insets)
+    }
+    
+    public override func refreshContent(entry: ChartDataEntry, highlight: Highlight) {
+        let string = "x: "
+            + xAxisValueFormatter.stringForValue(entry.x, axis: XAxis())
+            + ", y: "
+            + yFormatter.string(from: NSNumber(floatLiteral: entry.y))!
+        setLabel(string)
+    }
+    
+}
diff --git a/ChartsDemo-iOS/Swift/DemoBaseViewController.swift b/ChartsDemo-iOS/Swift/DemoBaseViewController.swift
new file mode 100644
index 0000000000..444d1f4729
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/DemoBaseViewController.swift
@@ -0,0 +1,366 @@
+//
+//  DemoBaseViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-03.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+enum Option {
+    case toggleValues
+    case toggleIcons
+    case toggleHighlight
+    case animateX
+    case animateY
+    case animateXY
+    case saveToGallery
+    case togglePinchZoom
+    case toggleAutoScaleMinMax
+    case toggleData
+    case toggleBarBorders
+    // CandleChart
+    case toggleShadowColorSameAsCandle
+    case toggleShowCandleBar
+    // CombinedChart
+    case toggleLineValues
+    case toggleBarValues
+    case removeDataSet
+    // CubicLineSampleFillFormatter
+    case toggleFilled
+    case toggleCircles
+    case toggleCubic
+    case toggleHorizontalCubic
+    case toggleStepped
+    // HalfPieChartController
+    case toggleXValues
+    case togglePercent
+    case toggleHole
+    case spin
+    case drawCenter
+    // RadarChart
+    case toggleXLabels
+    case toggleYLabels
+    case toggleRotate
+    case toggleHighlightCircle
+    
+    var label: String {
+        switch self {
+        case .toggleValues: return "Toggle Y-Values"
+        case .toggleIcons: return "Toggle Icons"
+        case .toggleHighlight: return "Toggle Highlight"
+        case .animateX: return "Animate X"
+        case .animateY: return "Animate Y"
+        case .animateXY: return "Animate XY"
+        case .saveToGallery: return "Save to Camera Roll"
+        case .togglePinchZoom: return "Toggle PinchZoom"
+        case .toggleAutoScaleMinMax: return "Toggle auto scale min/max"
+        case .toggleData: return "Toggle Data"
+        case .toggleBarBorders: return "Toggle Bar Borders"
+        // CandleChart
+        case .toggleShadowColorSameAsCandle: return "Toggle shadow same color"
+        case .toggleShowCandleBar: return "Toggle show candle bar"
+        // CombinedChart
+        case .toggleLineValues: return "Toggle Line Values"
+        case .toggleBarValues: return "Toggle Bar Values"
+        case .removeDataSet: return "Remove Random Set"
+        // CubicLineSampleFillFormatter
+        case .toggleFilled: return "Toggle Filled"
+        case .toggleCircles: return "Toggle Circles"
+        case .toggleCubic: return "Toggle Cubic"
+        case .toggleHorizontalCubic: return "Toggle Horizontal Cubic"
+        case .toggleStepped: return "Toggle Stepped"
+        // HalfPieChartController
+        case .toggleXValues: return "Toggle X-Values"
+        case .togglePercent: return "Toggle Percent"
+        case .toggleHole: return "Toggle Hole"
+        case .spin: return "Spin"
+        case .drawCenter: return "Draw CenterText"
+        // RadarChart
+        case .toggleXLabels: return "Toggle X-Labels"
+        case .toggleYLabels: return "Toggle Y-Labels"
+        case .toggleRotate: return "Toggle Rotate"
+        case .toggleHighlightCircle: return "Toggle highlight circle"
+        }
+    }
+}
+
+class DemoBaseViewController: UIViewController, ChartViewDelegate {
+    private var optionsTableView: UITableView? = nil
+    let parties = ["Party A", "Party B", "Party C", "Party D", "Party E", "Party F",
+                   "Party G", "Party H", "Party I", "Party J", "Party K", "Party L",
+                   "Party M", "Party N", "Party O", "Party P", "Party Q", "Party R",
+                   "Party S", "Party T", "Party U", "Party V", "Party W", "Party X",
+                   "Party Y", "Party Z"]
+    
+    @IBOutlet weak var optionsButton: UIButton!
+    var options: [Option]!
+    
+    var shouldHideData: Bool = false
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        self.initialize()
+    }
+    
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        self.initialize()
+    }
+    
+    private func initialize() {
+        self.edgesForExtendedLayout = []
+    }
+    
+    func optionTapped(_ option: Option) {}
+    
+    func handleOption(_ option: Option, forChartView chartView: ChartViewBase) {
+        switch option {
+        case .toggleValues:
+            for set in chartView.data!.dataSets {
+                set.drawValuesEnabled = !set.drawValuesEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleIcons:
+            for set in chartView.data!.dataSets {
+                set.drawIconsEnabled = !set.drawIconsEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleHighlight:
+            chartView.data!.highlightEnabled = !chartView.data!.isHighlightEnabled
+            chartView.setNeedsDisplay()
+            
+        case .animateX:
+            chartView.animate(xAxisDuration: 3)
+            
+        case .animateY:
+            chartView.animate(yAxisDuration: 3)
+            
+        case .animateXY:
+            chartView.animate(xAxisDuration: 3, yAxisDuration: 3)
+            
+        case .saveToGallery:
+            UIImageWriteToSavedPhotosAlbum(chartView.getChartImage(transparent: false)!, nil, nil, nil)
+            
+        case .togglePinchZoom:
+            let barLineChart = chartView as! BarLineChartViewBase
+            barLineChart.pinchZoomEnabled = !barLineChart.pinchZoomEnabled
+            chartView.setNeedsDisplay()
+            
+        case .toggleAutoScaleMinMax:
+            let barLineChart = chartView as! BarLineChartViewBase
+            barLineChart.autoScaleMinMaxEnabled = !barLineChart.isAutoScaleMinMaxEnabled
+            chartView.notifyDataSetChanged()
+            
+        case .toggleData:
+            shouldHideData = !shouldHideData
+            updateChartData()
+            
+        case .toggleBarBorders:
+            for set in chartView.data!.dataSets {
+                if let set = set as? BarChartDataSet {
+                    set.barBorderWidth = set.barBorderWidth == 1.0 ? 0.0 : 1.0
+                }
+            }
+            chartView.setNeedsDisplay()
+        default:
+            break
+        }
+    }
+    
+    @IBAction func optionsButtonTapped(_ sender: Any) {
+        if let optionsTableView = self.optionsTableView {
+            optionsTableView.removeFromSuperview()
+            self.optionsTableView = nil
+            return
+        }
+        
+        let optionsTableView = UITableView()
+        optionsTableView.backgroundColor = UIColor(white: 0, alpha: 0.9)
+        optionsTableView.delegate = self
+        optionsTableView.dataSource = self
+        
+        optionsTableView.translatesAutoresizingMaskIntoConstraints = false
+        
+        self.optionsTableView = optionsTableView
+        
+        var constraints = [NSLayoutConstraint]()
+        
+        constraints.append(NSLayoutConstraint(item: optionsTableView,
+                                              attribute: .leading,
+                                              relatedBy: .equal,
+                                              toItem: self.view,
+                                              attribute: .leading,
+                                              multiplier: 1,
+                                              constant: 40))
+        
+        constraints.append(NSLayoutConstraint(item: optionsTableView,
+                                              attribute: .trailing,
+                                              relatedBy: .equal,
+                                              toItem: sender as! UIView,
+                                              attribute: .trailing,
+                                              multiplier: 1,
+                                              constant: 0))
+        
+        constraints.append(NSLayoutConstraint(item: optionsTableView,
+                                              attribute: .top,
+                                              relatedBy: .equal,
+                                              toItem: sender,
+                                              attribute: .bottom,
+                                              multiplier: 1,
+                                              constant: 5))
+        
+        self.view.addSubview(optionsTableView)
+        constraints.forEach { $0.isActive = true }
+        
+        let constraint = NSLayoutConstraint(item: optionsTableView,
+                                            attribute: .height,
+                                            relatedBy: .equal,
+                                            toItem: nil,
+                                            attribute: .height,
+                                            multiplier: 1,
+                                            constant: 220)
+        constraint.isActive = true
+    }
+    
+    func updateChartData() {
+        fatalError("updateChartData not overridden")
+    }
+    
+    func setup(pieChartView chartView: PieChartView) {
+        chartView.usePercentValuesEnabled = true
+        chartView.drawSlicesUnderHoleEnabled = false
+        chartView.holeRadiusPercent = 0.58
+        chartView.transparentCircleRadiusPercent = 0.61
+        chartView.chartDescription?.enabled = false
+        chartView.setExtraOffsets(left: 5, top: 10, right: 5, bottom: 5)
+        
+        chartView.drawCenterTextEnabled = true
+        
+        let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
+        paragraphStyle.lineBreakMode = .byTruncatingTail
+        paragraphStyle.alignment = .center
+        
+        let centerText = NSMutableAttributedString(string: "Charts\nby Daniel Cohen Gindi")
+        centerText.setAttributes([.font : UIFont(name: "HelveticaNeue-Light", size: 13)!,
+                                  .paragraphStyle : paragraphStyle], range: NSRange(location: 0, length: centerText.length))
+        centerText.addAttributes([.font : UIFont(name: "HelveticaNeue-Light", size: 11)!,
+                                  .foregroundColor : UIColor.gray], range: NSRange(location: 10, length: centerText.length - 10))
+        centerText.addAttributes([.font : UIFont(name: "HelveticaNeue-Light", size: 11)!,
+                                  .foregroundColor : UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1)], range: NSRange(location: centerText.length - 19, length: 19))
+        chartView.centerAttributedText = centerText;
+        
+        chartView.drawHoleEnabled = true
+        chartView.rotationAngle = 0
+        chartView.rotationEnabled = true
+        chartView.highlightPerTapEnabled = true
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .right
+        l.verticalAlignment = .top
+        l.orientation = .vertical
+        l.drawInside = false
+        l.xEntrySpace = 7
+        l.yEntrySpace = 0
+        l.yOffset = 0
+//        chartView.legend = l
+    }
+    
+    func setup(radarChartView chartView: RadarChartView) {
+        chartView.chartDescription?.enabled = false
+    }
+    
+    func setup(barLineChartView chartView: BarLineChartViewBase) {
+        chartView.chartDescription?.enabled = false
+                
+        chartView.dragEnabled = true
+        chartView.setScaleEnabled(true)
+        chartView.pinchZoomEnabled = false
+        
+        // ChartYAxis *leftAxis = chartView.leftAxis;
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bottom
+        
+        chartView.rightAxis.enabled = false
+    }
+    // TODO: Cannot override from extensions
+    //extension DemoBaseViewController: ChartViewDelegate {
+    func chartValueSelected(_ chartView: ChartViewBase, entry: ChartDataEntry, highlight: Highlight) {
+        NSLog("chartValueSelected");
+    }
+    
+    func chartValueNothingSelected(_ chartView: ChartViewBase) {
+        NSLog("chartValueNothingSelected");
+    }
+    
+    func chartScaled(_ chartView: ChartViewBase, scaleX: CGFloat, scaleY: CGFloat) {
+        
+    }
+    
+    func chartTranslated(_ chartView: ChartViewBase, dX: CGFloat, dY: CGFloat) {
+        
+    }
+}
+
+extension DemoBaseViewController: UITableViewDelegate, UITableViewDataSource {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        if optionsTableView != nil {
+            return 1
+        }
+        
+        return 0
+    }
+    
+    @available(iOS 2.0, *)
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if optionsTableView != nil {
+            return options.count
+        }
+        
+        return 0
+        
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if optionsTableView != nil {
+            return 40.0;
+        }
+        
+        return 44.0;
+    }
+    
+    @available(iOS 2.0, *)
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        var cell = tableView.dequeueReusableCell(withIdentifier: "Cell")
+        
+        if cell == nil {
+            cell = UITableViewCell(style: .default, reuseIdentifier: "Cell")
+            cell?.backgroundView = nil
+            cell?.backgroundColor = .clear
+            cell?.textLabel?.textColor = .white
+        }
+        cell?.textLabel?.text = self.options[indexPath.row].label
+        
+        return cell!
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if optionsTableView != nil {
+            tableView.deselectRow(at: indexPath, animated: true)
+            
+            optionsTableView?.removeFromSuperview()
+            self.optionsTableView = nil
+            
+            self.optionTapped(self.options[indexPath.row])
+        }
+        
+    }
+}
+
diff --git a/ChartsDemo-iOS/Swift/DemoListViewController.swift b/ChartsDemo-iOS/Swift/DemoListViewController.swift
new file mode 100644
index 0000000000..f11ef9f528
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/DemoListViewController.swift
@@ -0,0 +1,131 @@
+//
+//  DemoListViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+private struct ItemDef {
+    let title: String
+    let subtitle: String
+    let `class`: AnyClass
+}
+
+class DemoListViewController: UIViewController {
+    
+    @IBOutlet var tableView: UITableView!
+    private var itemDefs = [ItemDef(title: "Line Chart",
+                            subtitle: "A simple demonstration of the linechart.",
+                            class: LineChart1ViewController.self),
+                    ItemDef(title: "Line Chart (Dual YAxis)",
+                            subtitle: "Demonstration of the linechart with dual y-axis.",
+                            class: LineChart2ViewController.self),
+                    ItemDef(title: "Bar Chart",
+                            subtitle: "A simple demonstration of the bar chart.",
+                            class: BarChartViewController.self),
+                    ItemDef(title: "Horizontal Bar Chart",
+                            subtitle: "A simple demonstration of the horizontal bar chart.",
+                            class: HorizontalBarChartViewController.self),
+                    ItemDef(title: "Combined Chart",
+                            subtitle: "Demonstrates how to create a combined chart (bar and line in this case).",
+                            class: CombinedChartViewController.self),
+                    ItemDef(title: "Pie Chart",
+                            subtitle: "A simple demonstration of the pie chart.",
+                            class: PieChartViewController.self),
+                    ItemDef(title: "Pie Chart with value lines",
+                            subtitle: "A simple demonstration of the pie chart with polyline notes.",
+                            class: PiePolylineChartViewController.self),
+                    ItemDef(title: "Scatter Chart",
+                            subtitle: "A simple demonstration of the scatter chart.",
+                            class: ScatterChartViewController.self),
+                    ItemDef(title: "Bubble Chart",
+                            subtitle: "A simple demonstration of the bubble chart.",
+                            class: BubbleChartViewController.self),
+                    ItemDef(title: "Stacked Bar Chart",
+                            subtitle: "A simple demonstration of a bar chart with stacked bars.",
+                            class: StackedBarChartViewController.self),
+                    ItemDef(title: "Stacked Bar Chart Negative",
+                            subtitle: "A simple demonstration of stacked bars with negative and positive values.",
+                            class: NegativeStackedBarChartViewController.self),
+                    ItemDef(title: "Another Bar Chart",
+                            subtitle: "Implementation of a BarChart that only shows values at the bottom.",
+                            class: AnotherBarChartViewController.self),
+                    ItemDef(title: "Multiple Lines Chart",
+                            subtitle: "A line chart with multiple DataSet objects. One color per DataSet.",
+                            class: MultipleLinesChartViewController.self),
+                    ItemDef(title: "Multiple Bars Chart",
+                            subtitle: "A bar chart with multiple DataSet objects. One multiple colors per DataSet.",
+                            class: MultipleBarChartViewController.self),
+                    ItemDef(title: "Candle Stick Chart",
+                            subtitle: "Demonstrates usage of the CandleStickChart.",
+                            class: CandleStickChartViewController.self),
+                    ItemDef(title: "Cubic Line Chart",
+                            subtitle: "Demonstrates cubic lines in a LineChart.",
+                            class: CubicLineChartViewController.self),
+                    ItemDef(title: "Radar Chart",
+                            subtitle: "Demonstrates the use of a spider-web like (net) chart.",
+                            class: RadarChartViewController.self),
+                    ItemDef(title: "Colored Line Chart",
+                            subtitle: "Shows a LineChart with different background and line color.",
+                            class: ColoredLineChartViewController.self),
+                    ItemDef(title: "Sinus Bar Chart",
+                            subtitle: "A Bar Chart plotting the sinus function with 8.000 values.",
+                            class: SinusBarChartViewController.self),
+                    ItemDef(title: "BarChart positive / negative",
+                            subtitle: "This demonstrates how to create a BarChart with positive and negative values in different colors.",
+                            class: PositiveNegativeBarChartViewController.self),
+                    ItemDef(title: "Time Line Chart",
+                            subtitle: "Simple demonstration of a time-chart. This chart draws one line entry per hour originating from the current time in milliseconds.",
+                            class: LineChartTimeViewController.self),
+                    ItemDef(title: "Filled Line Chart",
+                            subtitle: "This demonstrates how to fill an area between two LineDataSets.",
+                            class: LineChartFilledViewController.self),
+                    ItemDef(title: "Half Pie Chart",
+                            subtitle: "This demonstrates how to create a 180 degree PieChart.",
+                            class: HalfPieChartViewController.self)
+    ]
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        self.title = "Charts Demonstration"
+        self.tableView.rowHeight = 70
+        //FIXME: Add TimeLineChart
+        
+    }
+}
+
+extension DemoListViewController: UITableViewDelegate, UITableViewDataSource {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.itemDefs.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let def = self.itemDefs[indexPath.row]
+        let cell = tableView.dequeueReusableCell(withIdentifier: "Cell") ?? UITableViewCell(style: .subtitle, reuseIdentifier: "Cell")
+        cell.textLabel?.text = def.title
+        cell.detailTextLabel?.text = def.subtitle
+        cell.detailTextLabel?.numberOfLines = 0
+        
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let def = self.itemDefs[indexPath.row]
+        
+        let vcClass = def.class as! UIViewController.Type
+        let vc = vcClass.init()
+        
+        self.navigationController?.pushViewController(vc, animated: true)
+        tableView.deselectRow(at: indexPath, animated: true)
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift
new file mode 100644
index 0000000000..45391a05b2
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift
@@ -0,0 +1,102 @@
+//
+//  AnotherBarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class AnotherBarChartViewController: DemoBaseViewController {
+    
+    @IBOutlet var chartView: BarChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Another Bar Chart"
+        
+        self.options = [.toggleValues,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleData,
+                        .toggleBarBorders]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        chartView.maxVisibleCount = 60
+        chartView.pinchZoomEnabled = false
+        chartView.drawBarShadowEnabled = false
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bottom
+                
+        chartView.legend.enabled = false
+        
+        sliderX.value = 10
+        sliderY.value = 100
+        self.slidersValueChanged(nil)
+    }
+    
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value) + 1, range: Double(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: Double) {
+        let yVals = (0..<count).map { (i) -> BarChartDataEntry in
+            let mult = range + 1
+            let val = Double(arc4random_uniform(UInt32(mult))) + mult/3
+            return BarChartDataEntry(x: Double(i), y: val)
+        }
+        
+        var set1: BarChartDataSet! = nil
+        if let set = chartView.data?.dataSets.first as? BarChartDataSet {
+            set1 = set
+            set1?.replaceEntries(yVals)
+            chartView.data?.notifyDataChanged()
+            chartView.notifyDataSetChanged()
+        } else {
+            set1 = BarChartDataSet(entries: yVals, label: "Data Set")
+            set1.colors = ChartColorTemplates.vordiplom()
+            set1.drawValuesEnabled = false
+            
+            let data = BarChartData(dataSet: set1)
+            chartView.data = data
+            chartView.fitBars = true
+        }
+        
+        chartView.setNeedsDisplay()
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift
new file mode 100644
index 0000000000..5400646822
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift
@@ -0,0 +1,157 @@
+//
+//  BarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+class BarChartViewController: DemoBaseViewController {
+    
+    @IBOutlet var chartView: BarChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Bar Chart"
+        
+        self.options = [.toggleValues,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleData,
+                        .toggleBarBorders]
+        
+        self.setup(barLineChartView: chartView)
+        
+        chartView.delegate = self
+        
+        chartView.drawBarShadowEnabled = false
+        chartView.drawValueAboveBarEnabled = false
+        
+        chartView.maxVisibleCount = 60
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bottom
+        xAxis.labelFont = .systemFont(ofSize: 10)
+        xAxis.granularity = 1
+        xAxis.labelCount = 7
+        xAxis.valueFormatter = DayAxisValueFormatter(chart: chartView)
+        
+        let leftAxisFormatter = NumberFormatter()
+        leftAxisFormatter.minimumFractionDigits = 0
+        leftAxisFormatter.maximumFractionDigits = 1
+        leftAxisFormatter.negativeSuffix = " $"
+        leftAxisFormatter.positiveSuffix = " $"
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.labelFont = .systemFont(ofSize: 10)
+        leftAxis.labelCount = 8
+        leftAxis.valueFormatter = DefaultAxisValueFormatter(formatter: leftAxisFormatter)
+        leftAxis.labelPosition = .outsideChart
+        leftAxis.spaceTop = 0.15
+        leftAxis.axisMinimum = 0 // FIXME: HUH?? this replaces startAtZero = YES
+        
+        let rightAxis = chartView.rightAxis
+        rightAxis.enabled = true
+        rightAxis.labelFont = .systemFont(ofSize: 10)
+        rightAxis.labelCount = 8
+        rightAxis.valueFormatter = leftAxis.valueFormatter
+        rightAxis.spaceTop = 0.15
+        rightAxis.axisMinimum = 0
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .left
+        l.verticalAlignment = .bottom
+        l.orientation = .horizontal
+        l.drawInside = false
+        l.form = .circle
+        l.formSize = 9
+        l.font = UIFont(name: "HelveticaNeue-Light", size: 11)!
+        l.xEntrySpace = 4
+//        chartView.legend = l
+
+        let marker = XYMarkerView(color: UIColor(white: 180/250, alpha: 1),
+                                  font: .systemFont(ofSize: 12),
+                                  textColor: .white,
+                                  insets: UIEdgeInsets(top: 8, left: 8, bottom: 20, right: 8),
+                                  xAxisValueFormatter: chartView.xAxis.valueFormatter!)
+        marker.chartView = chartView
+        marker.minimumSize = CGSize(width: 80, height: 40)
+        chartView.marker = marker
+        
+        sliderX.value = 12
+        sliderY.value = 50
+        slidersValueChanged(nil)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value) + 1, range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let start = 1
+        
+        let yVals = (start..<start+count+1).map { (i) -> BarChartDataEntry in
+            let mult = range + 1
+            let val = Double(arc4random_uniform(mult))
+            if arc4random_uniform(100) < 25 {
+                return BarChartDataEntry(x: Double(i), y: val, icon: UIImage(named: "icon"))
+            } else {
+                return BarChartDataEntry(x: Double(i), y: val)
+            }
+        }
+        
+        var set1: BarChartDataSet! = nil
+        if let set = chartView.data?.dataSets.first as? BarChartDataSet {
+            set1 = set
+            set1.replaceEntries(yVals)
+            chartView.data?.notifyDataChanged()
+            chartView.notifyDataSetChanged()
+        } else {
+            set1 = BarChartDataSet(entries: yVals, label: "The year 2017")
+            set1.colors = ChartColorTemplates.material()
+            set1.drawValuesEnabled = false
+            
+            let data = BarChartData(dataSet: set1)
+            data.setValueFont(UIFont(name: "HelveticaNeue-Light", size: 10)!)
+            data.barWidth = 0.9
+            chartView.data = data
+        }
+        
+//        chartView.setNeedsDisplay()
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value + 2))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift
new file mode 100644
index 0000000000..064354021c
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift
@@ -0,0 +1,129 @@
+//
+//  BubbleChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class BubbleChartViewController: DemoBaseViewController {
+    
+    @IBOutlet var chartView: BubbleChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Bubble Chart"
+        self.options = [.toggleValues,
+                        .toggleIcons,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.dragEnabled = false
+        chartView.setScaleEnabled(true)
+        chartView.maxVisibleCount = 200
+        chartView.pinchZoomEnabled = true
+        
+        chartView.legend.horizontalAlignment = .right
+        chartView.legend.verticalAlignment = .top
+        chartView.legend.orientation = .vertical
+        chartView.legend.drawInside = false
+        chartView.legend.font = UIFont(name: "HelveticaNeue-Light", size: 10)!
+        
+        chartView.leftAxis.labelFont = UIFont(name: "HelveticaNeue-Light", size: 10)!
+        chartView.leftAxis.spaceTop = 0.3
+        chartView.leftAxis.spaceBottom = 0.3
+        chartView.leftAxis.axisMinimum = 0
+        
+        chartView.rightAxis.enabled = false
+        
+        chartView.xAxis.labelPosition = .bottom
+        chartView.xAxis.labelFont = UIFont(name: "HelveticaNeue-Light", size: 10)!
+        
+        sliderX.value = 10
+        sliderY.value = 50
+        slidersValueChanged(nil)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let yVals1 = (0..<count).map { (i) -> BubbleChartDataEntry in
+            let val = Double(arc4random_uniform(range))
+            let size = CGFloat(arc4random_uniform(range))
+            return BubbleChartDataEntry(x: Double(i), y: val, size: size, icon: UIImage(named: "icon"))
+        }
+        let yVals2 = (0..<count).map { (i) -> BubbleChartDataEntry in
+            let val = Double(arc4random_uniform(range))
+            let size = CGFloat(arc4random_uniform(range))
+            return BubbleChartDataEntry(x: Double(i), y: val, size: size, icon: UIImage(named: "icon"))
+        }
+        let yVals3 = (0..<count).map { (i) -> BubbleChartDataEntry in
+            let val = Double(arc4random_uniform(range))
+            let size = CGFloat(arc4random_uniform(range))
+            return BubbleChartDataEntry(x: Double(i), y: val, size: size)
+        }
+        
+        let set1 = BubbleChartDataSet(entries: yVals1, label: "DS 1")
+        set1.drawIconsEnabled = false
+        set1.setColor(ChartColorTemplates.colorful()[0], alpha: 0.5)
+        set1.drawValuesEnabled = true
+        
+        let set2 = BubbleChartDataSet(entries: yVals2, label: "DS 2")
+        set2.drawIconsEnabled = false
+        set2.iconsOffset = CGPoint(x: 0, y: 15)
+        set2.setColor(ChartColorTemplates.colorful()[1], alpha: 0.5)
+        set2.drawValuesEnabled = true
+        
+        let set3 = BubbleChartDataSet(entries: yVals3, label: "DS 3")
+        set3.setColor(ChartColorTemplates.colorful()[2], alpha: 0.5)
+        set3.drawValuesEnabled = true
+        
+        let data = BubbleChartData(dataSets: [set1, set2, set3])
+        data.setDrawValues(false)
+        data.setValueFont(UIFont(name: "HelveticaNeue-Light", size: 7)!)
+        data.setHighlightCircleWidth(1.5)
+        data.setValueTextColor(.white)
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift
new file mode 100644
index 0000000000..42460be98e
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift
@@ -0,0 +1,131 @@
+//
+//  CandleStickChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class CandleStickChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: CandleStickChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Candle Stick Chart"
+        self.options = [.toggleValues,
+                        .toggleIcons,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleShadowColorSameAsCandle,
+                        .toggleShowCandleBar,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.dragEnabled = false
+        chartView.setScaleEnabled(true)
+        chartView.maxVisibleCount = 200
+        chartView.pinchZoomEnabled = true
+        
+        chartView.legend.horizontalAlignment = .right
+        chartView.legend.verticalAlignment = .top
+        chartView.legend.orientation = .vertical
+        chartView.legend.drawInside = false
+        chartView.legend.font = UIFont(name: "HelveticaNeue-Light", size: 10)!
+        
+        chartView.leftAxis.labelFont = UIFont(name: "HelveticaNeue-Light", size: 10)!
+        chartView.leftAxis.spaceTop = 0.3
+        chartView.leftAxis.spaceBottom = 0.3
+        chartView.leftAxis.axisMinimum = 0
+        
+        chartView.rightAxis.enabled = false
+        
+        chartView.xAxis.labelPosition = .bottom
+        chartView.xAxis.labelFont = UIFont(name: "HelveticaNeue-Light", size: 10)!
+        
+        sliderX.value = 10
+        sliderY.value = 50
+        slidersValueChanged(nil)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let yVals1 = (0..<count).map { (i) -> CandleChartDataEntry in
+            let mult = range + 1
+            let val = Double(arc4random_uniform(40) + mult)
+            let high = Double(arc4random_uniform(9) + 8)
+            let low = Double(arc4random_uniform(9) + 8)
+            let open = Double(arc4random_uniform(6) + 1)
+            let close = Double(arc4random_uniform(6) + 1)
+            let even = i % 2 == 0
+            
+            return CandleChartDataEntry(x: Double(i), shadowH: val + high, shadowL: val - low, open: even ? val + open : val - open, close: even ? val - close : val + close, icon: UIImage(named: "icon")!)
+        }
+        
+        let set1 = CandleChartDataSet(entries: yVals1, label: "Data Set")
+        set1.axisDependency = .left
+        set1.setColor(UIColor(white: 80/255, alpha: 1))
+        set1.drawIconsEnabled = false
+        set1.shadowColor = .darkGray
+        set1.shadowWidth = 0.7
+        set1.decreasingColor = .red
+        set1.decreasingFilled = true
+        set1.increasingColor = UIColor(red: 122/255, green: 242/255, blue: 84/255, alpha: 1)
+        set1.increasingFilled = false
+        set1.neutralColor = .blue
+        
+        let data = CandleChartData(dataSet: set1)
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleShadowColorSameAsCandle:
+            for set in chartView.data!.dataSets as! [CandleChartDataSet] {
+                set.shadowColorSameAsCandle = !set.shadowColorSameAsCandle
+            }
+            chartView.notifyDataSetChanged()
+        case .toggleShowCandleBar:
+            for set in chartView.data!.dataSets as! [CandleChartDataSet] {
+                set.showCandleBar = !set.showCandleBar
+            }
+            chartView.notifyDataSetChanged()
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }}
diff --git a/ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift
new file mode 100644
index 0000000000..c5dd3566c6
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift
@@ -0,0 +1,79 @@
+//
+//  ColoredLineChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-04.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class ColoredLineChartViewController: DemoBaseViewController {
+    @IBOutlet var chartViews: [LineChartView]!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        self.title = "Colored Line Chart"
+        
+        let colors = [UIColor(red: 137/255, green: 230/255, blue: 81/255, alpha: 1),
+                      UIColor(red: 240/255, green: 240/255, blue: 30/255, alpha: 1),
+                      UIColor(red: 89/255, green: 199/255, blue: 250/255, alpha: 1),
+                      UIColor(red: 250/255, green: 104/255, blue: 104/255, alpha: 1)]
+        
+        for (i, chartView) in chartViews.enumerated() {
+            let data = dataWithCount(36, range: 100)
+            data.setValueFont(UIFont(name: "HelveticaNeue", size: 7)!)
+            
+            setupChart(chartView, data: data, color: colors[i % colors.count])
+        }
+    }
+    
+    func setupChart(_ chart: LineChartView, data: LineChartData, color: UIColor) {
+        (data.getDataSetByIndex(0) as! LineChartDataSet).circleHoleColor = color
+        
+        chart.delegate = self
+        chart.backgroundColor = color
+        
+        chart.chartDescription?.enabled = false
+        
+        chart.dragEnabled = true
+        chart.setScaleEnabled(true)
+        chart.pinchZoomEnabled = false
+        chart.setViewPortOffsets(left: 10, top: 0, right: 10, bottom: 0)
+        
+        chart.legend.enabled = false
+        
+        chart.leftAxis.enabled = false
+        chart.leftAxis.spaceTop = 0.4
+        chart.leftAxis.spaceBottom = 0.4
+        chart.rightAxis.enabled = false
+        chart.xAxis.enabled = false
+        
+        chart.data = data
+        
+        chart.animate(xAxisDuration: 2.5)
+    }
+    
+    func dataWithCount(_ count: Int, range: UInt32) -> LineChartData {
+        let yVals = (0..<count).map { i -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range)) + 3
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        
+        let set1 = LineChartDataSet(entries: yVals, label: "DataSet 1")
+        
+        set1.lineWidth = 1.75
+        set1.circleRadius = 5.0
+        set1.circleHoleRadius = 2.5
+        set1.setColor(.white)
+        set1.setCircleColor(.white)
+        set1.highlightColor = .white
+        set1.drawValuesEnabled = false
+        
+        return LineChartData(dataSet: set1)
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift
new file mode 100644
index 0000000000..8ec5263bf2
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift
@@ -0,0 +1,238 @@
+//
+//  CombinedChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+private let ITEM_COUNT = 12
+
+class CombinedChartViewController: DemoBaseViewController {
+    @IBOutlet var chartView: CombinedChartView!
+    
+    let months = ["Jan", "Feb", "Mar",
+                  "Apr", "May", "Jun",
+                  "Jul", "Aug", "Sep",
+                  "Oct", "Nov", "Dec"]
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Combined Chart"
+        self.options = [.toggleLineValues,
+                        .toggleBarValues,
+                        .saveToGallery,
+                        .toggleData,
+                        .toggleBarBorders,
+                        .removeDataSet]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.drawBarShadowEnabled = false
+        chartView.highlightFullBarEnabled = false
+        
+        
+        chartView.drawOrder = [DrawOrder.bar.rawValue,
+                               DrawOrder.bubble.rawValue,
+                               DrawOrder.candle.rawValue,
+                               DrawOrder.line.rawValue,
+                               DrawOrder.scatter.rawValue]
+        
+        let l = chartView.legend
+        l.wordWrapEnabled = true
+        l.horizontalAlignment = .center
+        l.verticalAlignment = .bottom
+        l.orientation = .horizontal
+        l.drawInside = false
+//        chartView.legend = l
+
+        let rightAxis = chartView.rightAxis
+        rightAxis.axisMinimum = 0
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.axisMinimum = 0
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bothSided
+        xAxis.axisMinimum = 0
+        xAxis.granularity = 1
+        xAxis.valueFormatter = self
+        
+        self.updateChartData()
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setChartData()
+    }
+    
+    func setChartData() {
+        let data = CombinedChartData()
+        data.lineData = generateLineData()
+        data.barData = generateBarData()
+        data.bubbleData = generateBubbleData()
+        data.scatterData = generateScatterData()
+        data.candleData = generateCandleData()
+        
+        chartView.xAxis.axisMaximum = data.xMax + 0.25
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleLineValues:
+            for set in chartView.data!.dataSets {
+                if let set = set as? LineChartDataSet {
+                    set.drawValuesEnabled = !set .drawValuesEnabled
+                    
+                }
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleBarValues:
+            for set in chartView.data!.dataSets {
+                if let set = set as? BarChartDataSet {
+                    set.drawValuesEnabled = !set .drawValuesEnabled
+                }
+            }
+            chartView.setNeedsDisplay()
+            
+        case .removeDataSet:
+            let rnd = Int(arc4random_uniform(UInt32(chartView.data!.dataSetCount)))
+            chartView.data?.removeDataSet(chartView.data!.getDataSetByIndex(rnd))
+            chartView.data?.notifyDataChanged()
+            chartView.notifyDataSetChanged()
+            
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+    
+    func generateLineData() -> LineChartData {
+        let entries = (0..<ITEM_COUNT).map { (i) -> ChartDataEntry in
+            return ChartDataEntry(x: Double(i) + 0.5, y: Double(arc4random_uniform(15) + 5))
+        }
+        
+        let set = LineChartDataSet(entries: entries, label: "Line DataSet")
+        set.setColor(UIColor(red: 240/255, green: 238/255, blue: 70/255, alpha: 1))
+        set.lineWidth = 2.5
+        set.setCircleColor(UIColor(red: 240/255, green: 238/255, blue: 70/255, alpha: 1))
+        set.circleRadius = 5
+        set.circleHoleRadius = 2.5
+        set.fillColor = UIColor(red: 240/255, green: 238/255, blue: 70/255, alpha: 1)
+        set.mode = .cubicBezier
+        set.drawValuesEnabled = true
+        set.valueFont = .systemFont(ofSize: 10)
+        set.valueTextColor = UIColor(red: 240/255, green: 238/255, blue: 70/255, alpha: 1)
+        
+        set.axisDependency = .left
+        
+        return LineChartData(dataSet: set)
+    }
+    
+    func generateBarData() -> BarChartData {
+        let entries1 = (0..<ITEM_COUNT).map { _ -> BarChartDataEntry in
+            return BarChartDataEntry(x: 0, y: Double(arc4random_uniform(25) + 25))
+        }
+        let entries2 = (0..<ITEM_COUNT).map { _ -> BarChartDataEntry in
+            return BarChartDataEntry(x: 0, yValues: [Double(arc4random_uniform(13) + 12), Double(arc4random_uniform(13) + 12)])
+        }
+        
+        let set1 = BarChartDataSet(entries: entries1, label: "Bar 1")
+        set1.setColor(UIColor(red: 60/255, green: 220/255, blue: 78/255, alpha: 1))
+        set1.valueTextColor = UIColor(red: 60/255, green: 220/255, blue: 78/255, alpha: 1)
+        set1.valueFont = .systemFont(ofSize: 10)
+        set1.axisDependency = .left
+        
+        let set2 = BarChartDataSet(entries: entries2, label: "")
+        set2.stackLabels = ["Stack 1", "Stack 2"]
+        set2.colors = [UIColor(red: 61/255, green: 165/255, blue: 255/255, alpha: 1),
+                       UIColor(red: 23/255, green: 197/255, blue: 255/255, alpha: 1)
+        ]
+        set2.valueTextColor = UIColor(red: 61/255, green: 165/255, blue: 255/255, alpha: 1)
+        set2.valueFont = .systemFont(ofSize: 10)
+        set2.axisDependency = .left
+        
+        let groupSpace = 0.06
+        let barSpace = 0.02 // x2 dataset
+        let barWidth = 0.45 // x2 dataset
+        // (0.45 + 0.02) * 2 + 0.06 = 1.00 -> interval per "group"
+        
+        let data = BarChartData(dataSets: [set1, set2])
+        data.barWidth = barWidth
+        
+        // make this BarData object grouped
+        data.groupBars(fromX: 0, groupSpace: groupSpace, barSpace: barSpace)
+        
+        return data
+    }
+    
+    func generateScatterData() -> ScatterChartData {
+        let entries = stride(from: 0.0, to: Double(ITEM_COUNT), by: 0.5).map { (i) -> ChartDataEntry in
+            return ChartDataEntry(x: i+0.25, y: Double(arc4random_uniform(10) + 55))
+        }
+        
+        let set = ScatterChartDataSet(entries: entries, label: "Scatter DataSet")
+        set.colors = ChartColorTemplates.material()
+        set.scatterShapeSize = 4.5
+        set.drawValuesEnabled = false
+        set.valueFont = .systemFont(ofSize: 10)
+        
+        return ScatterChartData(dataSet: set)
+    }
+    
+    func generateCandleData() -> CandleChartData {
+        let entries = stride(from: 0, to: ITEM_COUNT, by: 2).map { (i) -> CandleChartDataEntry in
+            return CandleChartDataEntry(x: Double(i+1), shadowH: 90, shadowL: 70, open: 85, close: 75)
+        }
+        
+        let set = CandleChartDataSet(entries: entries, label: "Candle DataSet")
+        set.setColor(UIColor(red: 80/255, green: 80/255, blue: 80/255, alpha: 1))
+        set.decreasingColor = UIColor(red: 142/255, green: 150/255, blue: 175/255, alpha: 1)
+        set.shadowColor = .darkGray
+        set.valueFont = .systemFont(ofSize: 10)
+        set.drawValuesEnabled = false
+        
+        return CandleChartData(dataSet: set)
+    }
+    
+    func generateBubbleData() -> BubbleChartData {
+        let entries = (0..<ITEM_COUNT).map { (i) -> BubbleChartDataEntry in
+            return BubbleChartDataEntry(x: Double(i) + 0.5,
+                                        y: Double(arc4random_uniform(10) + 105),
+                                        size: CGFloat(arc4random_uniform(50) + 105))
+        }
+        
+        let set = BubbleChartDataSet(entries: entries, label: "Bubble DataSet")
+        set.setColors(ChartColorTemplates.vordiplom(), alpha: 1)
+        set.valueTextColor = .white
+        set.valueFont = .systemFont(ofSize: 10)
+        set.drawValuesEnabled = true
+        
+        return BubbleChartData(dataSet: set)
+    }
+}
+
+extension CombinedChartViewController: IAxisValueFormatter {
+    func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        return months[Int(value) % months.count]
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift
new file mode 100644
index 0000000000..c1a65a2d4f
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift
@@ -0,0 +1,157 @@
+//
+//  CubicLineChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+private class CubicLineSampleFillFormatter: IFillFormatter {
+    func getFillLinePosition(dataSet: ILineChartDataSet, dataProvider: LineChartDataProvider) -> CGFloat {
+        return -10
+    }
+}
+
+class CubicLineChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: LineChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Cubic Line Chart"
+        
+        self.options = [.toggleValues,
+                        .toggleFilled,
+                        .toggleCircles,
+                        .toggleCubic,
+                        .toggleHorizontalCubic,
+                        .toggleStepped,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+
+        chartView.delegate = self
+
+        chartView.setViewPortOffsets(left: 0, top: 20, right: 0, bottom: 0)
+        chartView.backgroundColor = UIColor(red: 104/255, green: 241/255, blue: 175/255, alpha: 1)
+        
+        chartView.dragEnabled = true
+        chartView.setScaleEnabled(true)
+        chartView.pinchZoomEnabled = false
+        chartView.maxHighlightDistance = 300
+        
+        chartView.xAxis.enabled = false
+        
+        let yAxis = chartView.leftAxis
+        yAxis.labelFont = UIFont(name: "HelveticaNeue-Light", size:12)!
+        yAxis.setLabelCount(6, force: false)
+        yAxis.labelTextColor = .white
+        yAxis.labelPosition = .insideChart
+        yAxis.axisLineColor = .white
+        
+        chartView.rightAxis.enabled = false
+        chartView.legend.enabled = false
+        
+        sliderX.value = 45
+        sliderY.value = 100
+        self.slidersValueChanged(nil)
+        
+        chartView.animate(xAxisDuration: 2, yAxisDuration: 2)
+    }
+
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value + 1), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let yVals1 = (0..<count).map { (i) -> ChartDataEntry in
+            let mult = range + 1
+            let val = Double(arc4random_uniform(mult) + 20)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+
+        let set1 = LineChartDataSet(entries: yVals1, label: "DataSet 1")
+        set1.mode = .cubicBezier
+        set1.drawCirclesEnabled = false
+        set1.lineWidth = 1.8
+        set1.circleRadius = 4
+        set1.setCircleColor(.white)
+        set1.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
+        set1.fillColor = .white
+        set1.fillAlpha = 1
+        set1.drawHorizontalHighlightIndicatorEnabled = false
+        set1.fillFormatter = CubicLineSampleFillFormatter()
+        
+        let data = LineChartData(dataSet: set1)
+        data.setValueFont(UIFont(name: "HelveticaNeue-Light", size: 9)!)
+        data.setDrawValues(false)
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleFilled:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawFilledEnabled = !set.drawFilledEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCircles:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawCirclesEnabled = !set.drawCirclesEnabled
+            }
+            chartView.setNeedsDisplay()
+
+        case .toggleCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleStepped:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .stepped) ? .linear : .stepped
+            }
+            chartView.setNeedsDisplay()
+
+        case .toggleHorizontalCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift
new file mode 100644
index 0000000000..c02c5cafae
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift
@@ -0,0 +1,144 @@
+//
+//  HalfPieChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class HalfPieChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: PieChartView!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Half Pie Chart"
+        
+        self.options = [.toggleValues,
+                        .toggleXValues,
+                        .togglePercent,
+                        .toggleHole,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .spin,
+                        .drawCenter,
+                        .saveToGallery,
+                        .toggleData]
+        
+        self.setup(pieChartView: chartView)
+        
+        chartView.delegate = self
+        
+        chartView.holeColor = .white
+        chartView.transparentCircleColor = NSUIColor.white.withAlphaComponent(0.43)
+        chartView.holeRadiusPercent = 0.58
+        chartView.rotationEnabled = false
+        chartView.highlightPerTapEnabled = true
+        
+        chartView.maxAngle = 180 // Half chart
+        chartView.rotationAngle = 180 // Rotate to make the half on the upper side
+        chartView.centerTextOffset = CGPoint(x: 0, y: -20)
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .center
+        l.verticalAlignment = .top
+        l.orientation = .horizontal
+        l.drawInside = false
+        l.xEntrySpace = 7
+        l.yEntrySpace = 0
+        l.yOffset = 0
+//        chartView.legend = l
+
+        // entry label styling
+        chartView.entryLabelColor = .white
+        chartView.entryLabelFont = UIFont(name:"HelveticaNeue-Light", size:12)!
+        
+        self.updateChartData()
+        
+        chartView.animate(xAxisDuration: 1.4, easingOption: .easeOutBack)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(4, range: 100)
+    }
+
+    func setDataCount(_ count: Int, range: UInt32) {
+        let entries = (0..<count).map { (i) -> PieChartDataEntry in
+            // IMPORTANT: In a PieChart, no values (Entry) should have the same xIndex (even if from different DataSets), since no values can be drawn above each other.
+            return PieChartDataEntry(value: Double(arc4random_uniform(range) + range / 5),
+                                     label: parties[i % parties.count])
+        }
+        
+        let set = PieChartDataSet(entries: entries, label: "Election Results")
+        set.sliceSpace = 3
+        set.selectionShift = 5
+        set.colors = ChartColorTemplates.material()
+        
+        let data = PieChartData(dataSet: set)
+        
+        let pFormatter = NumberFormatter()
+        pFormatter.numberStyle = .percent
+        pFormatter.maximumFractionDigits = 1
+        pFormatter.multiplier = 1
+        pFormatter.percentSymbol = " %"
+        data.setValueFormatter(DefaultValueFormatter(formatter: pFormatter))
+    
+        data.setValueFont(UIFont(name: "HelveticaNeue-Light", size: 11)!)
+        data.setValueTextColor(.white)
+        
+        chartView.data = data
+        
+        chartView.setNeedsDisplay()
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleXValues:
+            chartView.drawEntryLabelsEnabled = !chartView.drawEntryLabelsEnabled
+            chartView.setNeedsDisplay()
+            
+        case .togglePercent:
+            chartView.usePercentValuesEnabled = !chartView.usePercentValuesEnabled
+            chartView.setNeedsDisplay()
+            
+        case .toggleHole:
+            chartView.drawHoleEnabled = !chartView.drawHoleEnabled
+            chartView.setNeedsDisplay()
+            
+        case .drawCenter:
+            chartView.drawCenterTextEnabled = !chartView.drawCenterTextEnabled
+            chartView.setNeedsDisplay()
+            
+        case .animateX:
+            chartView.animate(xAxisDuration: 1.4)
+            
+        case .animateY:
+            chartView.animate(yAxisDuration: 1.4)
+            
+        case .animateXY:
+            chartView.animate(xAxisDuration: 1.4, yAxisDuration: 1.4)
+            
+        case .spin:
+            chartView.spin(duration: 2,
+                           fromAngle: chartView.rotationAngle,
+                           toAngle: chartView.rotationAngle + 360,
+                           easingOption: .easeInCubic)
+            
+        default:
+            handleOption(option, forChartView: chartView)
+        }
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift
new file mode 100644
index 0000000000..ef77b9cab2
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift
@@ -0,0 +1,126 @@
+//
+//  HorizontalBarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class HorizontalBarChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: HorizontalBarChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Horizontal Bar Char"
+        self.options = [.toggleValues,
+                        .toggleIcons,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData,
+                        .toggleBarBorders]
+        
+        self.setup(barLineChartView: chartView)
+
+        chartView.delegate = self
+        
+        chartView.drawBarShadowEnabled = false
+        chartView.drawValueAboveBarEnabled = true
+        
+        chartView.maxVisibleCount = 60
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bottom
+        xAxis.labelFont = .systemFont(ofSize: 10)
+        xAxis.drawAxisLineEnabled = true
+        xAxis.granularity = 10
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.labelFont = .systemFont(ofSize: 10)
+        leftAxis.drawAxisLineEnabled = true
+        leftAxis.drawGridLinesEnabled = true
+        leftAxis.axisMinimum = 0
+
+        let rightAxis = chartView.rightAxis
+        rightAxis.enabled = true
+        rightAxis.labelFont = .systemFont(ofSize: 10)
+        rightAxis.drawAxisLineEnabled = true
+        rightAxis.axisMinimum = 0
+
+        let l = chartView.legend
+        l.horizontalAlignment = .left
+        l.verticalAlignment = .bottom
+        l.orientation = .horizontal
+        l.drawInside = false
+        l.form = .square
+        l.formSize = 8
+        l.font = UIFont(name: "HelveticaNeue-Light", size: 11)!
+        l.xEntrySpace = 4
+//        chartView.legend = l
+
+        chartView.fitBars = true
+
+        sliderX.value = 12
+        sliderY.value = 50
+        slidersValueChanged(nil)
+        
+        chartView.animate(yAxisDuration: 2.5)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value) + 1, range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let barWidth = 9.0
+        let spaceForBar = 10.0
+        
+        let yVals = (0..<count).map { (i) -> BarChartDataEntry in
+            let mult = range + 1
+            let val = Double(arc4random_uniform(mult))
+            return BarChartDataEntry(x: Double(i)*spaceForBar, y: val, icon: #imageLiteral(resourceName: "icon"))
+        }
+        
+        let set1 = BarChartDataSet(entries: yVals, label: "DataSet")
+        set1.drawIconsEnabled = false
+        
+        let data = BarChartData(dataSet: set1)
+        data.setValueFont(UIFont(name:"HelveticaNeue-Light", size:10)!)
+        data.barWidth = barWidth
+        
+        chartView.data = data
+    }
+
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift
new file mode 100644
index 0000000000..43e5ff4f78
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift
@@ -0,0 +1,189 @@
+//
+//  LineChart1ViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class LineChart1ViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: LineChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Line Chart 1"
+        self.options = [.toggleValues,
+                        .toggleFilled,
+                        .toggleCircles,
+                        .toggleCubic,
+                        .toggleHorizontalCubic,
+                        .toggleIcons,
+                        .toggleStepped,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        chartView.dragEnabled = true
+        chartView.setScaleEnabled(true)
+        chartView.pinchZoomEnabled = true
+        
+        // x-axis limit line
+        let llXAxis = ChartLimitLine(limit: 10, label: "Index 10")
+        llXAxis.lineWidth = 4
+        llXAxis.lineDashLengths = [10, 10, 0]
+        llXAxis.labelPosition = .bottomRight
+        llXAxis.valueFont = .systemFont(ofSize: 10)
+        
+        chartView.xAxis.gridLineDashLengths = [10, 10]
+        chartView.xAxis.gridLineDashPhase = 0
+        
+        let ll1 = ChartLimitLine(limit: 150, label: "Upper Limit")
+        ll1.lineWidth = 4
+        ll1.lineDashLengths = [5, 5]
+        ll1.labelPosition = .topRight
+        ll1.valueFont = .systemFont(ofSize: 10)
+        
+        let ll2 = ChartLimitLine(limit: -30, label: "Lower Limit")
+        ll2.lineWidth = 4
+        ll2.lineDashLengths = [5,5]
+        ll2.labelPosition = .bottomRight
+        ll2.valueFont = .systemFont(ofSize: 10)
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.removeAllLimitLines()
+        leftAxis.addLimitLine(ll1)
+        leftAxis.addLimitLine(ll2)
+        leftAxis.axisMaximum = 200
+        leftAxis.axisMinimum = -50
+        leftAxis.gridLineDashLengths = [5, 5]
+        leftAxis.drawLimitLinesBehindDataEnabled = true
+        
+        chartView.rightAxis.enabled = false
+        
+        //[_chartView.viewPortHandler setMaximumScaleY: 2.f];
+        //[_chartView.viewPortHandler setMaximumScaleX: 2.f];
+
+        let marker = BalloonMarker(color: UIColor(white: 180/255, alpha: 1),
+                                   font: .systemFont(ofSize: 12),
+                                   textColor: .white,
+                                   insets: UIEdgeInsets(top: 8, left: 8, bottom: 20, right: 8))
+        marker.chartView = chartView
+        marker.minimumSize = CGSize(width: 80, height: 40)
+        chartView.marker = marker
+        
+        chartView.legend.form = .line
+        
+        sliderX.value = 45
+        sliderY.value = 100
+        slidersValueChanged(nil)
+        
+        chartView.animate(xAxisDuration: 2.5)
+    }
+
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+
+    func setDataCount(_ count: Int, range: UInt32) {
+        let values = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i), y: val, icon: #imageLiteral(resourceName: "icon"))
+        }
+        
+        let set1 = LineChartDataSet(entries: values, label: "DataSet 1")
+        set1.drawIconsEnabled = false
+        
+        set1.lineDashLengths = [5, 2.5]
+        set1.highlightLineDashLengths = [5, 2.5]
+        set1.setColor(.black)
+        set1.setCircleColor(.black)
+        set1.lineWidth = 1
+        set1.circleRadius = 3
+        set1.drawCircleHoleEnabled = false
+        set1.valueFont = .systemFont(ofSize: 9)
+        set1.formLineDashLengths = [5, 2.5]
+        set1.formLineWidth = 1
+        set1.formSize = 15
+        
+        let gradientColors = [ChartColorTemplates.colorFromString("#00ff0000").cgColor,
+                              ChartColorTemplates.colorFromString("#ffff0000").cgColor]
+        let gradient = CGGradient(colorsSpace: nil, colors: gradientColors as CFArray, locations: nil)!
+        
+        set1.fillAlpha = 1
+        set1.fill = Fill(linearGradient: gradient, angle: 90) //.linearGradient(gradient, angle: 90)
+        set1.drawFilledEnabled = true
+        
+        let data = LineChartData(dataSet: set1)
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleFilled:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawFilledEnabled = !set.drawFilledEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCircles:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawCirclesEnabled = !set.drawCirclesEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleStepped:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .stepped) ? .linear : .stepped
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleHorizontalCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift
new file mode 100644
index 0000000000..d2ee8c8297
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift
@@ -0,0 +1,202 @@
+//
+//  LineChart2ViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class LineChart2ViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: LineChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Line Chart 2"
+        self.options = [.toggleValues,
+                        .toggleFilled,
+                        .toggleCircles,
+                        .toggleCubic,
+                        .toggleHorizontalCubic,
+                        .toggleStepped,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        chartView.dragEnabled = true
+        chartView.setScaleEnabled(true)
+        chartView.pinchZoomEnabled = true
+        
+        let l = chartView.legend
+        l.form = .line
+        l.font = UIFont(name: "HelveticaNeue-Light", size: 11)!
+        l.textColor = .white
+        l.horizontalAlignment = .left
+        l.verticalAlignment = .bottom
+        l.orientation = .horizontal
+        l.drawInside = false
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelFont = .systemFont(ofSize: 11)
+        xAxis.labelTextColor = .white
+        xAxis.drawAxisLineEnabled = false
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.labelTextColor = UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1)
+        leftAxis.axisMaximum = 200
+        leftAxis.axisMinimum = 0
+        leftAxis.drawGridLinesEnabled = true
+        leftAxis.granularityEnabled = true
+        
+        let rightAxis = chartView.rightAxis
+        rightAxis.labelTextColor = .red
+        rightAxis.axisMaximum = 900
+        rightAxis.axisMinimum = -200
+        rightAxis.granularityEnabled = false
+        
+        sliderX.value = 20
+        sliderY.value = 30
+        slidersValueChanged(nil)
+        
+        chartView.animate(xAxisDuration: 2.5)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value + 1), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let yVals1 = (0..<count).map { (i) -> ChartDataEntry in
+            let mult = range / 2
+            let val = Double(arc4random_uniform(mult) + 50)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        let yVals2 = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 450)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        let yVals3 = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 500)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+
+        let set1 = LineChartDataSet(entries: yVals1, label: "DataSet 1")
+        set1.axisDependency = .left
+        set1.setColor(UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1))
+        set1.setCircleColor(.white)
+        set1.lineWidth = 2
+        set1.circleRadius = 3
+        set1.fillAlpha = 65/255
+        set1.fillColor = UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1)
+        set1.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
+        set1.drawCircleHoleEnabled = false
+        
+        let set2 = LineChartDataSet(entries: yVals2, label: "DataSet 2")
+        set2.axisDependency = .right
+        set2.setColor(.red)
+        set2.setCircleColor(.white)
+        set2.lineWidth = 2
+        set2.circleRadius = 3
+        set2.fillAlpha = 65/255
+        set2.fillColor = .red
+        set2.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
+        set2.drawCircleHoleEnabled = false
+
+        let set3 = LineChartDataSet(entries: yVals3, label: "DataSet 3")
+        set3.axisDependency = .right
+        set3.setColor(.yellow)
+        set3.setCircleColor(.white)
+        set3.lineWidth = 2
+        set3.circleRadius = 3
+        set3.fillAlpha = 65/255
+        set3.fillColor = UIColor.yellow.withAlphaComponent(200/255)
+        set3.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
+        set3.drawCircleHoleEnabled = false
+        
+        let data = LineChartData(dataSets: [set1, set2, set3])
+        data.setValueTextColor(.white)
+        data.setValueFont(.systemFont(ofSize: 9))
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleFilled:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawFilledEnabled = !set.drawFilledEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCircles:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawCirclesEnabled = !set.drawCirclesEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleStepped:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .stepped) ? .linear : .stepped
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleHorizontalCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+    
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+//}
+    // TODO: Declarations in extensions cannot override yet.
+//extension LineChart2ViewController {
+    override func chartValueSelected(_ chartView: ChartViewBase, entry: ChartDataEntry, highlight: Highlight) {
+        super.chartValueSelected(chartView, entry: entry, highlight: highlight)
+        
+        self.chartView.centerViewToAnimated(xValue: entry.x, yValue: entry.y,
+                                            axis: self.chartView.data!.getDataSetByIndex(highlight.dataSetIndex).axisDependency,
+                                            duration: 1)
+        //[_chartView moveViewToAnimatedWithXValue:entry.x yValue:entry.y axis:[_chartView.data getDataSetByIndex:dataSetIndex].axisDependency duration:1.0];
+        //[_chartView zoomAndCenterViewAnimatedWithScaleX:1.8 scaleY:1.8 xValue:entry.x yValue:entry.y axis:[_chartView.data getDataSetByIndex:dataSetIndex].axisDependency duration:1.0];
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift
new file mode 100644
index 0000000000..3d17d968a7
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift
@@ -0,0 +1,119 @@
+//
+//  LineChartFilledViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class LineChartFilledViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: LineChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Filled Line Chart"
+        
+        chartView.delegate = self
+        
+        chartView.backgroundColor = .white
+        chartView.gridBackgroundColor = UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 150/255)
+        chartView.drawGridBackgroundEnabled = true
+        
+        chartView.drawBordersEnabled = true
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.pinchZoomEnabled = false
+        chartView.dragEnabled = true
+        chartView.setScaleEnabled(true)
+        
+        chartView.legend.enabled = false
+        
+        chartView.xAxis.enabled = false
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.axisMaximum = 900
+        leftAxis.axisMinimum = -250
+        leftAxis.drawAxisLineEnabled = false
+        
+        chartView.rightAxis.enabled = false
+        
+        sliderX.value = 100
+        sliderY.value = 60
+        slidersValueChanged(nil)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let yVals1 = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 50)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        let yVals2 = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 450)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        
+        let set1 = LineChartDataSet(entries: yVals1, label: "DataSet 1")
+        set1.axisDependency = .left
+        set1.setColor(UIColor(red: 255/255, green: 241/255, blue: 46/255, alpha: 1))
+        set1.drawCirclesEnabled = false
+        set1.lineWidth = 2
+        set1.circleRadius = 3
+        set1.fillAlpha = 1
+        set1.drawFilledEnabled = true
+        set1.fillColor = .white
+        set1.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
+        set1.drawCircleHoleEnabled = false
+        set1.fillFormatter = DefaultFillFormatter { _,_  -> CGFloat in
+            return CGFloat(self.chartView.leftAxis.axisMinimum)
+        }
+        
+        let set2 = LineChartDataSet(entries: yVals2, label: "DataSet 2")
+        set2.axisDependency = .left
+        set2.setColor(UIColor(red: 255/255, green: 241/255, blue: 46/255, alpha: 1))
+        set2.drawCirclesEnabled = false
+        set2.lineWidth = 2
+        set2.circleRadius = 3
+        set2.fillAlpha = 1
+        set2.drawFilledEnabled = true
+        set2.fillColor = .white
+        set2.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
+        set2.drawCircleHoleEnabled = false
+        set2.fillFormatter = DefaultFillFormatter { _,_  -> CGFloat in
+            return CGFloat(self.chartView.leftAxis.axisMaximum)
+        }
+
+        let data = LineChartData(dataSets: [set1, set2])
+        data.setDrawValues(false)
+        
+        chartView.data = data
+    }
+    
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift
new file mode 100644
index 0000000000..b5e14da3de
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift
@@ -0,0 +1,163 @@
+//
+//  LineChartTimeViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class LineChartTimeViewController: DemoBaseViewController {
+    @IBOutlet var chartView: LineChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Time Line Chart"
+        self.options = [.toggleValues,
+                        .toggleFilled,
+                        .toggleCircles,
+                        .toggleCubic,
+                        .toggleHorizontalCubic,
+                        .toggleStepped,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.dragEnabled = true
+        chartView.setScaleEnabled(true)
+        chartView.pinchZoomEnabled = false
+        chartView.highlightPerDragEnabled = true
+        
+        chartView.backgroundColor = .white
+        
+        chartView.legend.enabled = false
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .topInside
+        xAxis.labelFont = .systemFont(ofSize: 10, weight: .light)
+        xAxis.labelTextColor = UIColor(red: 255/255, green: 192/255, blue: 56/255, alpha: 1)
+        xAxis.drawAxisLineEnabled = false
+        xAxis.drawGridLinesEnabled = true
+        xAxis.centerAxisLabelsEnabled = true
+        xAxis.granularity = 3600
+        xAxis.valueFormatter = DateValueFormatter()
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.labelPosition = .insideChart
+        leftAxis.labelFont = .systemFont(ofSize: 12, weight: .light)
+        leftAxis.drawGridLinesEnabled = true
+        leftAxis.granularityEnabled = true
+        leftAxis.axisMinimum = 0
+        leftAxis.axisMaximum = 170
+        leftAxis.yOffset = -9
+        leftAxis.labelTextColor = UIColor(red: 255/255, green: 192/255, blue: 56/255, alpha: 1)
+
+        
+        chartView.rightAxis.enabled = false
+        
+        chartView.legend.form = .line
+        
+        sliderX.value = 100
+        slidersValueChanged(nil)
+        
+        chartView.animate(xAxisDuration: 2.5)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: 30)
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let now = Date().timeIntervalSince1970
+        let hourSeconds: TimeInterval = 3600
+        
+        let from = now - (Double(count) / 2) * hourSeconds
+        let to = now + (Double(count) / 2) * hourSeconds
+        
+        let values = stride(from: from, to: to, by: hourSeconds).map { (x) -> ChartDataEntry in
+            let y = arc4random_uniform(range) + 50
+            return ChartDataEntry(x: x, y: Double(y))
+        }
+        
+        let set1 = LineChartDataSet(entries: values, label: "DataSet 1")
+        set1.axisDependency = .left
+        set1.setColor(UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1))
+        set1.lineWidth = 1.5
+        set1.drawCirclesEnabled = false
+        set1.drawValuesEnabled = false
+        set1.fillAlpha = 0.26
+        set1.fillColor = UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1)
+        set1.highlightColor = UIColor(red: 244/255, green: 117/255, blue: 117/255, alpha: 1)
+        set1.drawCircleHoleEnabled = false
+        
+        let data = LineChartData(dataSet: set1)
+        data.setValueTextColor(.white)
+        data.setValueFont(.systemFont(ofSize: 9, weight: .light))
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleFilled:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawFilledEnabled = !set.drawFilledEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCircles:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawCirclesEnabled = !set.drawCirclesEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleStepped:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .stepped) ? .linear : .stepped
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleHorizontalCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .horizontalBezier : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+    
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift
new file mode 100644
index 0000000000..ca7f54a353
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift
@@ -0,0 +1,156 @@
+//
+//  MultipleBarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class MultipleBarChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: BarChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Multiple Bar Chart"
+        
+        self.options = [.toggleValues,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData,
+                        .toggleBarBorders]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled =  false
+        
+        chartView.pinchZoomEnabled = false
+        chartView.drawBarShadowEnabled = false
+        
+        let marker = BalloonMarker(color: UIColor(white: 180/255, alpha: 1), font: .systemFont(ofSize: 12), textColor: .white, insets: UIEdgeInsets(top: 8, left: 8, bottom: 20, right: 8))
+        marker.chartView = chartView
+        marker.minimumSize = CGSize(width: 80, height: 40)
+        chartView.marker = marker
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .right
+        l.verticalAlignment = .top
+        l.orientation = .vertical
+        l.drawInside = true
+        l.font = .systemFont(ofSize: 8, weight: .light)
+        l.yOffset = 10
+        l.xOffset = 10
+        l.yEntrySpace = 0
+//        chartView.legend = l
+
+        let xAxis = chartView.xAxis
+        xAxis.labelFont = .systemFont(ofSize: 10, weight: .light)
+        xAxis.granularity = 1
+        xAxis.centerAxisLabelsEnabled = true
+        xAxis.valueFormatter = IntAxisValueFormatter()
+        
+        let leftAxisFormatter = NumberFormatter()
+        leftAxisFormatter.maximumFractionDigits = 1
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.labelFont = .systemFont(ofSize: 10, weight: .light)
+        leftAxis.valueFormatter = LargeValueFormatter()
+        leftAxis.spaceTop = 0.35
+        leftAxis.axisMinimum = 0
+        
+        chartView.rightAxis.enabled = false
+        
+        sliderX.value = 10
+        sliderY.value = 100
+        slidersValueChanged(nil)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let groupSpace = 0.08
+        let barSpace = 0.03
+        let barWidth = 0.2
+        // (0.2 + 0.03) * 4 + 0.08 = 1.00 -> interval per "group"
+
+        let randomMultiplier = range * 100000
+        let groupCount = count + 1
+        let startYear = 1980
+        let endYear = startYear + groupCount
+        
+        let block: (Int) -> BarChartDataEntry = { (i) -> BarChartDataEntry in
+            return BarChartDataEntry(x: Double(i), y: Double(arc4random_uniform(randomMultiplier)))
+        }
+        let yVals1 = (startYear ..< endYear).map(block)
+        let yVals2 = (startYear ..< endYear).map(block)
+        let yVals3 = (startYear ..< endYear).map(block)
+        let yVals4 = (startYear ..< endYear).map(block)
+        
+        let set1 = BarChartDataSet(entries: yVals1, label: "Company A")
+        set1.setColor(UIColor(red: 104/255, green: 241/255, blue: 175/255, alpha: 1))
+        
+        let set2 = BarChartDataSet(entries: yVals2, label: "Company B")
+        set2.setColor(UIColor(red: 164/255, green: 228/255, blue: 251/255, alpha: 1))
+        
+        let set3 = BarChartDataSet(entries: yVals3, label: "Company C")
+        set3.setColor(UIColor(red: 242/255, green: 247/255, blue: 158/255, alpha: 1))
+        
+        let set4 = BarChartDataSet(entries: yVals4, label: "Company D")
+        set4.setColor(UIColor(red: 255/255, green: 102/255, blue: 0/255, alpha: 1))
+        
+        let data = BarChartData(dataSets: [set1, set2, set3, set4])
+        data.setValueFont(.systemFont(ofSize: 10, weight: .light))
+        data.setValueFormatter(LargeValueFormatter())
+        
+        // specify the width each bar should have
+        data.barWidth = barWidth
+
+        // restrict the x-axis range
+        chartView.xAxis.axisMinimum = Double(startYear)
+        
+        // groupWidthWithGroupSpace(...) is a helper that calculates the width each group needs based on the provided parameters
+        chartView.xAxis.axisMaximum = Double(startYear) + data.groupWidth(groupSpace: groupSpace, barSpace: barSpace) * Double(groupCount)
+        
+        data.groupBars(fromX: Double(startYear), groupSpace: groupSpace, barSpace: barSpace)
+
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        let startYear = 1980
+        let endYear = startYear + Int(sliderX.value)
+
+        sliderTextX.text = "\(startYear)-\(endYear)"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift
new file mode 100644
index 0000000000..29c8efbb5e
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift
@@ -0,0 +1,140 @@
+//
+//  MultipleLinesChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class MultipleLinesChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: LineChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Multiple Lines Chart"
+        self.options = [.toggleValues,
+                        .toggleFilled,
+                        .toggleCircles,
+                        .toggleCubic,
+                        .toggleStepped,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+
+        chartView.leftAxis.enabled = false
+        chartView.rightAxis.drawAxisLineEnabled = false
+        chartView.xAxis.drawAxisLineEnabled = false
+        
+        chartView.drawBordersEnabled = false
+        chartView.setScaleEnabled(true)
+
+        let l = chartView.legend
+        l.horizontalAlignment = .right
+        l.verticalAlignment = .top
+        l.orientation = .vertical
+        l.drawInside = false
+//        chartView.legend = l
+
+        sliderX.value = 20
+        sliderY.value = 100
+        slidersValueChanged(nil)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+    
+    // TODO: Refine data creation
+    func setDataCount(_ count: Int, range: UInt32) {
+        let colors = ChartColorTemplates.vordiplom()[0...2]
+        
+        let block: (Int) -> ChartDataEntry = { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        let dataSets = (0..<3).map { i -> LineChartDataSet in
+            let yVals = (0..<count).map(block)
+            let set = LineChartDataSet(entries: yVals, label: "DataSet \(i)")
+            set.lineWidth = 2.5
+            set.circleRadius = 4
+            set.circleHoleRadius = 2
+            let color = colors[i % colors.count]
+            set.setColor(color)
+            set.setCircleColor(color)
+            
+            return set
+        }
+        
+        dataSets[0].lineDashLengths = [5, 5]
+        dataSets[0].colors = ChartColorTemplates.vordiplom()
+        dataSets[0].circleColors = ChartColorTemplates.vordiplom()
+        
+        let data = LineChartData(dataSets: dataSets)
+        data.setValueFont(.systemFont(ofSize: 7, weight: .light))
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleFilled:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawFilledEnabled = !set.drawFilledEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCircles:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.drawCirclesEnabled = !set.drawCirclesEnabled
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleCubic:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .cubicBezier) ? .linear : .cubicBezier
+            }
+            chartView.setNeedsDisplay()
+            
+        case .toggleStepped:
+            for set in chartView.data!.dataSets as! [LineChartDataSet] {
+                set.mode = (set.mode == .stepped) ? .linear : .stepped
+            }
+            chartView.setNeedsDisplay()
+            
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift
new file mode 100644
index 0000000000..6585aad950
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift
@@ -0,0 +1,134 @@
+//
+//  NegativeStackedBarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class NegativeStackedBarChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: HorizontalBarChartView!
+    
+    lazy var customFormatter: NumberFormatter = {
+        let formatter = NumberFormatter()
+        formatter.negativePrefix = ""
+        formatter.positiveSuffix = "m"
+        formatter.negativeSuffix = "m"
+        formatter.minimumSignificantDigits = 1
+        formatter.minimumFractionDigits = 1
+        return formatter
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Stacked Bar Chart Negative"
+        self.options = [.toggleValues,
+                        .toggleIcons,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData,
+                        .toggleBarBorders]
+        
+
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.drawBarShadowEnabled = false
+        chartView.drawValueAboveBarEnabled = true
+        
+        chartView.leftAxis.enabled = false
+        let rightAxis = chartView.rightAxis
+        rightAxis.axisMaximum = 25
+        rightAxis.axisMinimum = -25
+        rightAxis.drawZeroLineEnabled = true
+        rightAxis.labelCount = 7
+        rightAxis.valueFormatter = DefaultAxisValueFormatter(formatter: customFormatter)
+        rightAxis.labelFont = .systemFont(ofSize: 9)
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bothSided
+        xAxis.drawAxisLineEnabled = false
+        xAxis.axisMinimum = 0
+        xAxis.axisMaximum = 110
+        xAxis.centerAxisLabelsEnabled = true
+        xAxis.labelCount = 12
+        xAxis.granularity = 10
+        xAxis.valueFormatter = self
+        xAxis.labelFont = .systemFont(ofSize: 9)
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .right
+        l.verticalAlignment = .bottom
+        l.orientation = .horizontal
+        l.formSize = 8
+        l.formToTextSpace = 8
+        l.xEntrySpace = 6
+//        chartView.legend = l
+
+        self.updateChartData()
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setChartData()
+    }
+    
+    func setChartData() {
+        let yVals = [BarChartDataEntry(x: 5, yValues: [-10, 10]),
+                     BarChartDataEntry(x: 15, yValues: [-12, 13]),
+                     BarChartDataEntry(x: 25, yValues: [-15, 15]),
+                     BarChartDataEntry(x: 35, yValues: [-17, 17]),
+                     BarChartDataEntry(x: 45, yValues: [-19, 120]),
+                     BarChartDataEntry(x: 55, yValues: [-19, 19]),
+                     BarChartDataEntry(x: 65, yValues: [-16, 16]),
+                     BarChartDataEntry(x: 75, yValues: [-13, 14]),
+                     BarChartDataEntry(x: 85, yValues: [-10, 11]),
+                     BarChartDataEntry(x: 95, yValues: [-5, 6]),
+                     BarChartDataEntry(x: 105, yValues: [-1, 2])
+        ]
+        
+        let set = BarChartDataSet(entries: yVals, label: "Age Distribution")
+        set.drawIconsEnabled = false
+        set.valueFormatter = DefaultValueFormatter(formatter: customFormatter)
+        set.valueFont = .systemFont(ofSize: 7)
+        set.axisDependency = .right
+        set.colors = [UIColor(red: 67/255, green: 67/255, blue: 72/255, alpha: 1),
+                      UIColor(red: 124/255, green: 181/255, blue: 236/255, alpha: 1)
+        ]
+        set.stackLabels = ["Men", "Women"]
+        
+        let data = BarChartData(dataSet: set)
+        data.barWidth = 8.5
+        
+        chartView.data = data
+        chartView.setNeedsDisplay()
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+}
+
+extension NegativeStackedBarChartViewController: IAxisValueFormatter {
+    func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        return String(format: "%03.0f-%03.0f", value, value + 10)
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift
new file mode 100644
index 0000000000..4f8cb3180b
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift
@@ -0,0 +1,155 @@
+//
+//  PieChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class PieChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: PieChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Pie Chart"
+        
+        self.options = [.toggleValues,
+                        .toggleXValues,
+                        .togglePercent, 
+                        .toggleHole,
+                        .toggleIcons,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .spin,
+                        .drawCenter,
+                        .saveToGallery,
+                        .toggleData]
+        
+        self.setup(pieChartView: chartView)
+        
+        chartView.delegate = self
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .right
+        l.verticalAlignment = .top
+        l.orientation = .vertical
+        l.xEntrySpace = 7
+        l.yEntrySpace = 0
+        l.yOffset = 0
+//        chartView.legend = l
+
+        // entry label styling
+        chartView.entryLabelColor = .white
+        chartView.entryLabelFont = .systemFont(ofSize: 12, weight: .light)
+        
+        sliderX.value = 4
+        sliderY.value = 100
+        self.slidersValueChanged(nil)
+        
+        chartView.animate(xAxisDuration: 1.4, easingOption: .easeOutBack)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let entries = (0..<count).map { (i) -> PieChartDataEntry in
+            // IMPORTANT: In a PieChart, no values (Entry) should have the same xIndex (even if from different DataSets), since no values can be drawn above each other.
+            return PieChartDataEntry(value: Double(arc4random_uniform(range) + range / 5),
+                                     label: parties[i % parties.count],
+                                     icon: #imageLiteral(resourceName: "icon"))
+        }
+        
+        let set = PieChartDataSet(entries: entries, label: "Election Results")
+        set.drawIconsEnabled = false
+        set.sliceSpace = 2
+        
+        
+        set.colors = ChartColorTemplates.vordiplom()
+            + ChartColorTemplates.joyful()
+            + ChartColorTemplates.colorful()
+            + ChartColorTemplates.liberty()
+            + ChartColorTemplates.pastel()
+            + [UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1)]
+        
+        let data = PieChartData(dataSet: set)
+        
+        let pFormatter = NumberFormatter()
+        pFormatter.numberStyle = .percent
+        pFormatter.maximumFractionDigits = 1
+        pFormatter.multiplier = 1
+        pFormatter.percentSymbol = " %"
+        data.setValueFormatter(DefaultValueFormatter(formatter: pFormatter))
+        
+        data.setValueFont(.systemFont(ofSize: 11, weight: .light))
+        data.setValueTextColor(.white)
+        
+        chartView.data = data
+        chartView.highlightValues(nil)
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleXValues:
+            chartView.drawEntryLabelsEnabled = !chartView.drawEntryLabelsEnabled
+            chartView.setNeedsDisplay()
+            
+        case .togglePercent:
+            chartView.usePercentValuesEnabled = !chartView.usePercentValuesEnabled
+            chartView.setNeedsDisplay()
+            
+        case .toggleHole:
+            chartView.drawHoleEnabled = !chartView.drawHoleEnabled
+            chartView.setNeedsDisplay()
+            
+        case .drawCenter:
+            chartView.drawCenterTextEnabled = !chartView.drawCenterTextEnabled
+            chartView.setNeedsDisplay()
+            
+        case .animateX:
+            chartView.animate(xAxisDuration: 1.4)
+            
+        case .animateY:
+            chartView.animate(yAxisDuration: 1.4)
+            
+        case .animateXY:
+            chartView.animate(xAxisDuration: 1.4, yAxisDuration: 1.4)
+            
+        case .spin:
+            chartView.spin(duration: 2,
+                           fromAngle: chartView.rotationAngle,
+                           toAngle: chartView.rotationAngle + 360,
+                           easingOption: .easeInCubic)
+            
+        default:
+            handleOption(option, forChartView: chartView)
+        }
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift
new file mode 100644
index 0000000000..a25000739b
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift
@@ -0,0 +1,145 @@
+//
+//  PiePolylineChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+import UIKit
+import Charts
+
+class PiePolylineChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: PieChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Pie Poly Line Chart"
+        
+        self.options = [.toggleValues,
+                        .toggleXValues,
+                        .togglePercent,
+                        .toggleHole,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .spin,
+                        .drawCenter,
+                        .saveToGallery,
+                        .toggleData]
+        
+        self.setup(pieChartView: chartView)
+        
+        chartView.delegate = self
+        
+        chartView.legend.enabled = false
+        chartView.setExtraOffsets(left: 20, top: 0, right: 20, bottom: 0)
+        
+        sliderX.value = 40
+        sliderY.value = 100
+        self.slidersValueChanged(nil)
+        
+        chartView.animate(xAxisDuration: 1.4, easingOption: .easeOutBack)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let entries = (0..<count).map { (i) -> PieChartDataEntry in
+            // IMPORTANT: In a PieChart, no values (Entry) should have the same xIndex (even if from different DataSets), since no values can be drawn above each other.
+            return PieChartDataEntry(value: Double(arc4random_uniform(range) + range / 5),
+                                     label: parties[i % parties.count])
+        }
+        
+        let set = PieChartDataSet(entries: entries, label: "Election Results")
+        set.sliceSpace = 2
+        
+        
+        set.colors = ChartColorTemplates.vordiplom()
+            + ChartColorTemplates.joyful()
+            + ChartColorTemplates.colorful()
+            + ChartColorTemplates.liberty()
+            + ChartColorTemplates.pastel()
+            + [UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1)]
+        
+        set.valueLinePart1OffsetPercentage = 0.8
+        set.valueLinePart1Length = 0.2
+        set.valueLinePart2Length = 0.4
+        //set.xValuePosition = .outsideSlice
+        set.yValuePosition = .outsideSlice
+        
+        let data = PieChartData(dataSet: set)
+        
+        let pFormatter = NumberFormatter()
+        pFormatter.numberStyle = .percent
+        pFormatter.maximumFractionDigits = 1
+        pFormatter.multiplier = 1
+        pFormatter.percentSymbol = " %"
+        data.setValueFormatter(DefaultValueFormatter(formatter: pFormatter))
+        data.setValueFont(.systemFont(ofSize: 11, weight: .light))
+        data.setValueTextColor(.black)
+        
+        chartView.data = data
+        chartView.highlightValues(nil)
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleXValues:
+            chartView.drawEntryLabelsEnabled = !chartView.drawEntryLabelsEnabled
+            chartView.setNeedsDisplay()
+            
+        case .togglePercent:
+            chartView.usePercentValuesEnabled = !chartView.usePercentValuesEnabled
+            chartView.setNeedsDisplay()
+            
+        case .toggleHole:
+            chartView.drawHoleEnabled = !chartView.drawHoleEnabled
+            chartView.setNeedsDisplay()
+            
+        case .drawCenter:
+            chartView.drawCenterTextEnabled = !chartView.drawCenterTextEnabled
+            chartView.setNeedsDisplay()
+            
+        case .animateX:
+            chartView.animate(xAxisDuration: 1.4)
+            
+        case .animateY:
+            chartView.animate(yAxisDuration: 1.4)
+            
+        case .animateXY:
+            chartView.animate(xAxisDuration: 1.4, yAxisDuration: 1.4)
+            
+        case .spin:
+            chartView.spin(duration: 2,
+                           fromAngle: chartView.rotationAngle,
+                           toAngle: chartView.rotationAngle + 360,
+                           easingOption: .easeInCubic)
+            
+        default:
+            handleOption(option, forChartView: chartView)
+        }
+    }
+    
+    // MARK: - Actions
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift
new file mode 100644
index 0000000000..36771b97c0
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift
@@ -0,0 +1,122 @@
+//
+//  PositiveNegativeBarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class PositiveNegativeBarChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: BarChartView!
+
+    let dataLabels = ["12-19",
+                      "12-30",
+                      "12-31",
+                      "01-01",
+                      "01-02"]
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Positive/Negative Bar Chart"
+        self.options = [.toggleValues,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData,
+                        .toggleBarBorders]
+        
+        self.setup(barLineChartView: chartView)
+        
+        chartView.delegate = self
+        
+        chartView.setExtraOffsets(left: 70, top: -30, right: 70, bottom: 10)
+    
+        chartView.drawBarShadowEnabled = false
+        chartView.drawValueAboveBarEnabled = true
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.rightAxis.enabled = false
+
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bottom
+        xAxis.labelFont = .systemFont(ofSize: 13)
+        xAxis.drawAxisLineEnabled = false
+        xAxis.labelTextColor = .lightGray
+        xAxis.labelCount = 5
+        xAxis.centerAxisLabelsEnabled = true
+        xAxis.granularity = 1
+        xAxis.valueFormatter = self
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.drawLabelsEnabled = false
+        leftAxis.spaceTop = 0.25
+        leftAxis.spaceBottom = 0.25
+        leftAxis.drawAxisLineEnabled = false
+        leftAxis.drawZeroLineEnabled = true
+        leftAxis.zeroLineColor = .gray
+        leftAxis.zeroLineWidth = 0.7
+        
+        self.updateChartData()
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setChartData()
+    }
+    
+    func setChartData() {
+        let yVals = [BarChartDataEntry(x: 0, y: -224.1),
+                     BarChartDataEntry(x: 1, y: 238.5),
+                     BarChartDataEntry(x: 2, y: 1280.1),
+                     BarChartDataEntry(x: 3, y: -442.3),
+                     BarChartDataEntry(x: 4, y: -2280.1)
+        ]
+        
+        let red = UIColor(red: 211/255, green: 74/255, blue: 88/255, alpha: 1)
+        let green = UIColor(red: 110/255, green: 190/255, blue: 102/255, alpha: 1)
+        let colors = yVals.map { (entry) -> NSUIColor in
+            return entry.y > 0 ? red : green
+        }
+        
+        let set = BarChartDataSet(entries: yVals, label: "Values")
+        set.colors = colors
+        set.valueColors = colors
+        
+        let data = BarChartData(dataSet: set)
+        data.setValueFont(.systemFont(ofSize: 13))
+        
+        let formatter = NumberFormatter()
+        formatter.maximumFractionDigits = 1
+        data.setValueFormatter(DefaultValueFormatter(formatter: formatter))
+        data.barWidth = 0.8
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+}
+
+extension PositiveNegativeBarChartViewController: IAxisValueFormatter {
+    func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        return dataLabels[min(max(Int(value), 0), dataLabels.count - 1)]
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift
new file mode 100644
index 0000000000..79f308d66a
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift
@@ -0,0 +1,205 @@
+//
+//  RadarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class RadarChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: RadarChartView!
+    
+    let activities = ["Burger", "Steak", "Salad", "Pasta", "Pizza"]
+    var originalBarBgColor: UIColor!
+    var originalBarTintColor: UIColor!
+    var originalBarStyle: UIBarStyle!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        self.title = "Radar Chart"
+        self.options = [.toggleValues,
+                        .toggleHighlight,
+                        .toggleHighlightCircle,
+                        .toggleXLabels,
+                        .toggleYLabels,
+                        .toggleRotate,
+                        .toggleFilled,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .spin,
+                        .saveToGallery,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        chartView.webLineWidth = 1
+        chartView.innerWebLineWidth = 1
+        chartView.webColor = .lightGray
+        chartView.innerWebColor = .lightGray
+        chartView.webAlpha = 1
+        
+        let marker = RadarMarkerView.viewFromXib()!
+        marker.chartView = chartView
+        chartView.marker = marker
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelFont = .systemFont(ofSize: 9, weight: .light)
+        xAxis.xOffset = 0
+        xAxis.yOffset = 0
+        xAxis.valueFormatter = self
+        xAxis.labelTextColor = .white
+        
+        let yAxis = chartView.yAxis
+        yAxis.labelFont = .systemFont(ofSize: 9, weight: .light)
+        yAxis.labelCount = 5
+        yAxis.axisMinimum = 0
+        yAxis.axisMaximum = 80
+        yAxis.drawLabelsEnabled = false
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .center
+        l.verticalAlignment = .top
+        l.orientation = .horizontal
+        l.drawInside = false
+        l.font = .systemFont(ofSize: 10, weight: .light)
+        l.xEntrySpace = 7
+        l.yEntrySpace = 5
+        l.textColor = .white
+//        chartView.legend = l
+
+        self.updateChartData()
+        
+        chartView.animate(xAxisDuration: 1.4, yAxisDuration: 1.4, easingOption: .easeOutBack)
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        UIView.animate(withDuration: 0.15) {
+            let navBar = self.navigationController!.navigationBar
+            self.originalBarBgColor = navBar.barTintColor
+            self.originalBarTintColor = navBar.tintColor
+            self.originalBarStyle = navBar.barStyle
+
+            navBar.barTintColor = self.view.backgroundColor
+            navBar.tintColor = .white
+            navBar.barStyle = .black
+        }
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        
+        UIView.animate(withDuration: 0.15) {
+            let navBar = self.navigationController!.navigationBar
+            navBar.barTintColor = self.originalBarBgColor
+            navBar.tintColor = self.originalBarTintColor
+            navBar.barStyle = self.originalBarStyle
+        }
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setChartData()
+    }
+    
+    func setChartData() {
+        let mult: UInt32 = 80
+        let min: UInt32 = 20
+        let cnt = 5
+        
+        let block: (Int) -> RadarChartDataEntry = { _ in return RadarChartDataEntry(value: Double(arc4random_uniform(mult) + min))}
+        let entries1 = (0..<cnt).map(block)
+        let entries2 = (0..<cnt).map(block)
+        
+        let set1 = RadarChartDataSet(entries: entries1, label: "Last Week")
+        set1.setColor(UIColor(red: 103/255, green: 110/255, blue: 129/255, alpha: 1))
+        set1.fillColor = UIColor(red: 103/255, green: 110/255, blue: 129/255, alpha: 1)
+        set1.drawFilledEnabled = true
+        set1.fillAlpha = 0.7
+        set1.lineWidth = 2
+        set1.drawHighlightCircleEnabled = true
+        set1.setDrawHighlightIndicators(false)
+        
+        let set2 = RadarChartDataSet(entries: entries2, label: "This Week")
+        set2.setColor(UIColor(red: 121/255, green: 162/255, blue: 175/255, alpha: 1))
+        set2.fillColor = UIColor(red: 121/255, green: 162/255, blue: 175/255, alpha: 1)
+        set2.drawFilledEnabled = true
+        set2.fillAlpha = 0.7
+        set2.lineWidth = 2
+        set2.drawHighlightCircleEnabled = true
+        set2.setDrawHighlightIndicators(false)
+        
+        let data = RadarChartData(dataSets: [set1, set2])
+        data.setValueFont(.systemFont(ofSize: 8, weight: .light))
+        data.setDrawValues(false)
+        data.setValueTextColor(.white)
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        switch option {
+        case .toggleXLabels:
+            chartView.xAxis.drawLabelsEnabled = !chartView.xAxis.drawLabelsEnabled
+            chartView.data?.notifyDataChanged()
+            chartView.notifyDataSetChanged()
+            chartView.setNeedsDisplay()
+            
+        case .toggleYLabels:
+            chartView.yAxis.drawLabelsEnabled = !chartView.yAxis.drawLabelsEnabled
+            chartView.setNeedsDisplay()
+
+        case .toggleRotate:
+            chartView.rotationEnabled = !chartView.rotationEnabled
+            
+        case .toggleFilled:
+            for set in chartView.data!.dataSets as! [RadarChartDataSet] {
+                set.drawFilledEnabled = !set.drawFilledEnabled
+            }
+            
+            chartView.setNeedsDisplay()
+            
+        case .toggleHighlightCircle:
+            for set in chartView.data!.dataSets as! [RadarChartDataSet] {
+                set.drawHighlightCircleEnabled = !set.drawHighlightCircleEnabled
+            }
+            chartView.setNeedsDisplay()
+
+        case .animateX:
+            chartView.animate(xAxisDuration: 1.4)
+            
+        case .animateY:
+            chartView.animate(yAxisDuration: 1.4)
+            
+        case .animateXY:
+            chartView.animate(xAxisDuration: 1.4, yAxisDuration: 1.4)
+            
+        case .spin:
+            chartView.spin(duration: 2, fromAngle: chartView.rotationAngle, toAngle: chartView.rotationAngle + 360, easingOption: .easeInCubic)
+            
+        default:
+            super.handleOption(option, forChartView: chartView)
+        }
+    }
+}
+
+extension RadarChartViewController: IAxisValueFormatter {
+    func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        return activities[Int(value) % activities.count]
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift
new file mode 100644
index 0000000000..b3d6907da7
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift
@@ -0,0 +1,126 @@
+//
+//  ScatterChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class ScatterChartViewController: DemoBaseViewController {
+    
+    @IBOutlet var chartView: ScatterChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Scatter Chart"
+        self.options = [.toggleValues,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.dragEnabled = true
+        chartView.setScaleEnabled(true)
+        chartView.maxVisibleCount = 200
+        chartView.pinchZoomEnabled = true
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .right
+        l.verticalAlignment = .top
+        l.orientation = .vertical
+        l.drawInside = false
+        l.font = .systemFont(ofSize: 10, weight: .light)
+        l.xOffset = 5
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.labelFont = .systemFont(ofSize: 10, weight: .light)
+        leftAxis.axisMinimum = 0
+        
+        chartView.rightAxis.enabled = false
+        
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelFont = .systemFont(ofSize: 10, weight: .light)
+        
+        sliderX.value = 45
+        sliderY.value = 100
+        slidersValueChanged(nil)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value + 1), range: UInt32(sliderY.value))
+    }
+    
+    func setDataCount(_ count: Int, range: UInt32) {
+        let values1 = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i), y: val)
+        }
+        let values2 = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i) + 0.33, y: val)
+        }
+        let values3 = (0..<count).map { (i) -> ChartDataEntry in
+            let val = Double(arc4random_uniform(range) + 3)
+            return ChartDataEntry(x: Double(i) + 0.66, y: val)
+        }
+
+        
+        let set1 = ScatterChartDataSet(entries: values1, label: "DS 1")
+        set1.setScatterShape(.square)
+        set1.setColor(ChartColorTemplates.colorful()[0])
+        set1.scatterShapeSize = 8
+        
+        let set2 = ScatterChartDataSet(entries: values2, label: "DS 2")
+        set2.setScatterShape(.circle)
+        set2.scatterShapeHoleColor = ChartColorTemplates.colorful()[3]
+        set2.scatterShapeHoleRadius = 3.5
+        set2.setColor(ChartColorTemplates.colorful()[1])
+        set2.scatterShapeSize = 8
+        
+        let set3 = ScatterChartDataSet(entries: values3, label: "DS 3")
+        set3.setScatterShape(.cross)
+        set3.setColor(ChartColorTemplates.colorful()[2])
+        set3.scatterShapeSize = 8
+        
+        let data = ScatterChartData(dataSets: [set1, set2, set3])
+        data.setValueFont(.systemFont(ofSize: 7, weight: .light))
+
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift
new file mode 100644
index 0000000000..918aef215a
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift
@@ -0,0 +1,110 @@
+//
+//  SinusBarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class SinusBarChartViewController: DemoBaseViewController {
+    
+    @IBOutlet var chartView: BarChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Sinus Bar Chart"
+        self.options = [.toggleValues,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData]
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.drawBarShadowEnabled = false
+        chartView.drawValueAboveBarEnabled = false
+        chartView.maxVisibleCount = 60
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .bottom
+        xAxis.enabled = false
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.labelCount = 6
+        leftAxis.axisMinimum = -2.5
+        leftAxis.axisMaximum = 2.5
+        leftAxis.granularityEnabled = true
+        leftAxis.granularity = 0.1
+        
+        let rightAxis = chartView.rightAxis
+        rightAxis.labelCount = 6
+        rightAxis.axisMinimum = -2.5
+        rightAxis.axisMaximum = 2.5
+        rightAxis.granularity = 0.1
+
+        let l = chartView.legend
+        l.horizontalAlignment = .left
+        l.verticalAlignment = .bottom
+        l.orientation = .horizontal
+        l.drawInside = false
+        l.form = .square
+        l.formSize = 9
+        l.font = .systemFont(ofSize: 11)
+        l.xEntrySpace = 4
+//        chartView.legend = l
+
+        sliderX.value = 150
+        slidersValueChanged(nil)
+        
+        chartView.animate(xAxisDuration: 2, yAxisDuration: 2)
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setDataCount(Int(sliderX.value))
+    }
+    
+    func setDataCount(_ count: Int) {
+        let entries = (0..<count).map {
+            BarChartDataEntry(x: Double($0), y: sin(.pi * Double($0%128) / 64))
+        }
+        
+        let set = BarChartDataSet(entries: entries, label: "Sinus Function")
+        set.setColor(UIColor(red: 240/255, green: 120/255, blue: 123/255, alpha: 1))
+        
+        let data = BarChartData(dataSet: set)
+        data.setValueFont(.systemFont(ofSize: 10, weight: .light))
+        data.setDrawValues(false)
+        data.barWidth = 0.8
+        
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        self.updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift
new file mode 100644
index 0000000000..87f3d64461
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift
@@ -0,0 +1,127 @@
+//
+//  StackedBarChartViewController.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+#if canImport(UIKit)
+    import UIKit
+#endif
+import Charts
+
+class StackedBarChartViewController: DemoBaseViewController {
+
+    @IBOutlet var chartView: BarChartView!
+    @IBOutlet var sliderX: UISlider!
+    @IBOutlet var sliderY: UISlider!
+    @IBOutlet var sliderTextX: UITextField!
+    @IBOutlet var sliderTextY: UITextField!
+
+    lazy var formatter: NumberFormatter = {
+        let formatter = NumberFormatter()
+        formatter.maximumFractionDigits = 1
+        formatter.negativeSuffix = " $"
+        formatter.positiveSuffix = " $"
+        
+        return formatter
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.title = "Stacked Bar Chart"
+        self.options = [.toggleValues,
+                        .toggleIcons,
+                        .toggleHighlight,
+                        .animateX,
+                        .animateY,
+                        .animateXY,
+                        .saveToGallery,
+                        .togglePinchZoom,
+                        .toggleAutoScaleMinMax,
+                        .toggleData,
+                        .toggleBarBorders]
+        
+        
+        chartView.delegate = self
+        
+        chartView.chartDescription?.enabled = false
+        
+        chartView.maxVisibleCount = 40
+        chartView.drawBarShadowEnabled = false
+        chartView.drawValueAboveBarEnabled = false
+        chartView.highlightFullBarEnabled = false
+        
+        let leftAxis = chartView.leftAxis
+        leftAxis.valueFormatter = DefaultAxisValueFormatter(formatter: formatter)
+        leftAxis.axisMinimum = 0
+        
+        chartView.rightAxis.enabled = false
+        
+        let xAxis = chartView.xAxis
+        xAxis.labelPosition = .top
+        
+        let l = chartView.legend
+        l.horizontalAlignment = .right
+        l.verticalAlignment = .bottom
+        l.orientation = .horizontal
+        l.drawInside = false
+        l.form = .square
+        l.formToTextSpace = 4
+        l.xEntrySpace = 6
+//        chartView.legend = l
+
+        sliderX.value = 12
+        sliderY.value = 100
+        slidersValueChanged(nil)
+        
+        self.updateChartData()
+    }
+    
+    override func updateChartData() {
+        if self.shouldHideData {
+            chartView.data = nil
+            return
+        }
+        
+        self.setChartData(count: Int(sliderX.value + 1), range: UInt32(sliderY.value))
+    }
+    
+    func setChartData(count: Int, range: UInt32) {
+        let yVals = (0..<count).map { (i) -> BarChartDataEntry in
+            let mult = range + 1
+            let val1 = Double(arc4random_uniform(mult) + mult / 3)
+            let val2 = Double(arc4random_uniform(mult) + mult / 3)
+            let val3 = Double(arc4random_uniform(mult) + mult / 3)
+            
+            return BarChartDataEntry(x: Double(i), yValues: [val1, val2, val3], icon: #imageLiteral(resourceName: "icon"))
+        }
+        
+        let set = BarChartDataSet(entries: yVals, label: "Statistics Vienna 2014")
+        set.drawIconsEnabled = false
+        set.colors = [ChartColorTemplates.material()[0], ChartColorTemplates.material()[1], ChartColorTemplates.material()[2]]
+        set.stackLabels = ["Births", "Divorces", "Marriages"]
+        
+        let data = BarChartData(dataSet: set)
+        data.setValueFont(.systemFont(ofSize: 7, weight: .light))
+        data.setValueFormatter(DefaultValueFormatter(formatter: formatter))
+        data.setValueTextColor(.white)
+        
+        chartView.fitBars = true
+        chartView.data = data
+    }
+    
+    override func optionTapped(_ option: Option) {
+        super.handleOption(option, forChartView: chartView)
+    }
+    
+    @IBAction func slidersValueChanged(_ sender: Any?) {
+        sliderTextX.text = "\(Int(sliderX.value))"
+        sliderTextY.text = "\(Int(sliderY.value))"
+        
+        updateChartData()
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift
new file mode 100644
index 0000000000..2962a6852a
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift
@@ -0,0 +1,23 @@
+//
+//  DateValueFormatter.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+import Foundation
+import Charts
+
+public class DateValueFormatter: NSObject, IAxisValueFormatter {
+    private let dateFormatter = DateFormatter()
+    
+    override init() {
+        super.init()
+        dateFormatter.dateFormat = "dd MMM HH:mm"
+    }
+    
+    public func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        return dateFormatter.string(from: Date(timeIntervalSince1970: value))
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift
new file mode 100644
index 0000000000..245a25c83e
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift
@@ -0,0 +1,109 @@
+//
+//  DayAxisValueFormatter.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+import Foundation
+import Charts
+
+public class DayAxisValueFormatter: NSObject, IAxisValueFormatter {
+    weak var chart: BarLineChartViewBase?
+    let months = ["Jan", "Feb", "Mar",
+                  "Apr", "May", "Jun",
+                  "Jul", "Aug", "Sep",
+                  "Oct", "Nov", "Dec"]
+    
+    init(chart: BarLineChartViewBase) {
+        self.chart = chart
+    }
+    
+    public func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        let days = Int(value)
+        let year = determineYear(forDays: days)
+        let month = determineMonth(forDayOfYear: days)
+        
+        let monthName = months[month % months.count]
+        let yearName = "\(year)"
+        
+        if let chart = chart,
+            chart.visibleXRange > 30 * 6 {
+            return monthName + yearName
+        } else {
+            let dayOfMonth = determineDayOfMonth(forDays: days, month: month + 12 * (year - 2016))
+            var appendix: String
+            
+            switch dayOfMonth {
+            case 1, 21, 31: appendix = "st"
+            case 2, 22: appendix = "nd"
+            case 3, 23: appendix = "rd"
+            default: appendix = "th"
+            }
+            
+            return dayOfMonth == 0 ? "" : String(format: "%d\(appendix) \(monthName)", dayOfMonth)
+        }
+    }
+    
+    private func days(forMonth month: Int, year: Int) -> Int {
+        // month is 0-based
+        switch month {
+        case 1:
+            var is29Feb = false
+            if year < 1582 {
+                is29Feb = (year < 1 ? year + 1 : year) % 4 == 0
+            } else if year > 1582 {
+                is29Feb = year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
+            }
+            
+            return is29Feb ? 29 : 28
+            
+        case 3, 5, 8, 10:
+            return 30
+            
+        default:
+            return 31
+        }
+    }
+    
+    private func determineMonth(forDayOfYear dayOfYear: Int) -> Int {
+        var month = -1
+        var days = 0
+        
+        while days < dayOfYear {
+            month += 1
+            if month >= 12 {
+                month = 0
+            }
+            
+            let year = determineYear(forDays: days)
+            days += self.days(forMonth: month, year: year)
+        }
+        
+        return max(month, 0)
+    }
+    
+    private func determineDayOfMonth(forDays days: Int, month: Int) -> Int {
+        var count = 0
+        var daysForMonth = 0
+        
+        while count < month {
+            let year = determineYear(forDays: days)
+            daysForMonth += self.days(forMonth: count % 12, year: year)
+            count += 1
+        }
+        
+        return days - daysForMonth
+    }
+    
+    private func determineYear(forDays days: Int) -> Int {
+        switch days {
+        case ...366: return 2016
+        case 367...730: return 2017
+        case 731...1094: return 2018
+        case 1095...1458: return 2019
+        default: return 2020
+        }
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift
new file mode 100644
index 0000000000..bd3062a190
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift
@@ -0,0 +1,16 @@
+//
+//  IntAxisValueFormatter.swift
+//  ChartsDemo-iOS
+//
+//  Created by Jacob Christie on 2017-07-09.
+//  Copyright © 2017 jc. All rights reserved.
+//
+
+import Foundation
+import Charts
+
+public class IntAxisValueFormatter: NSObject, IAxisValueFormatter {
+    public func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        return "\(Int(value))"
+    }
+}
diff --git a/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift
new file mode 100644
index 0000000000..c95ca034a6
--- /dev/null
+++ b/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift
@@ -0,0 +1,58 @@
+//
+//  LargeValueFormatter.swift
+//  ChartsDemo
+//  Copyright © 2016 dcg. All rights reserved.
+//
+
+import Foundation
+import Charts
+
+private let MAX_LENGTH = 5
+
+@objc protocol Testing123 { }
+
+public class LargeValueFormatter: NSObject, IValueFormatter, IAxisValueFormatter {
+    
+    /// Suffix to be appended after the values.
+    ///
+    /// **default**: suffix: ["", "k", "m", "b", "t"]
+    public var suffix = ["", "k", "m", "b", "t"]
+    
+    /// An appendix text to be added at the end of the formatted value.
+    public var appendix: String?
+    
+    public init(appendix: String? = nil) {
+        self.appendix = appendix
+    }
+    
+    fileprivate func format(value: Double) -> String {
+        var sig = value
+        var length = 0
+        let maxLength = suffix.count - 1
+        
+        while sig >= 1000.0 && length < maxLength {
+            sig /= 1000.0
+            length += 1
+        }
+        
+        var r = String(format: "%2.f", sig) + suffix[length]
+        
+        if let appendix = appendix {
+            r += appendix
+        }
+        
+        return r
+    }
+    
+    public func stringForValue(_ value: Double, axis: AxisBase?) -> String {
+        return format(value: value)
+    }
+    
+    public func stringForValue(
+        _ value: Double,
+        entry: ChartDataEntry,
+        dataSetIndex: Int,
+        viewPortHandler: ViewPortHandler?) -> String {
+        return format(value: value)
+    }
+}
diff --git a/ChartsDemo/Classes/DemoListViewController.xib b/ChartsDemo-iOS/XIBs/DemoListViewController.xib
similarity index 75%
rename from ChartsDemo/Classes/DemoListViewController.xib
rename to ChartsDemo-iOS/XIBs/DemoListViewController.xib
index 70df94ae66..651bae9f4c 100644
--- a/ChartsDemo/Classes/DemoListViewController.xib
+++ b/ChartsDemo-iOS/XIBs/DemoListViewController.xib
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DemoListViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DemoListViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="tableView" destination="QII-it-eiw" id="pci-Ed-uwl"/>
                 <outlet property="view" destination="iN0-l3-epB" id="cMs-L7-Quz"/>
@@ -18,6 +21,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="QII-it-eiw">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="asD-89-QES"/>
@@ -27,11 +31,12 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="bottom" secondItem="QII-it-eiw" secondAttribute="bottom" id="43W-wt-Yur"/>
+                <constraint firstItem="e7W-vt-N3v" firstAttribute="bottom" secondItem="QII-it-eiw" secondAttribute="bottom" id="43W-wt-Yur"/>
                 <constraint firstItem="QII-it-eiw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="6JX-cm-T75"/>
                 <constraint firstAttribute="trailing" secondItem="QII-it-eiw" secondAttribute="trailing" id="Sws-jY-WYw"/>
                 <constraint firstItem="QII-it-eiw" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="uo3-Uc-8Tl"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="e7W-vt-N3v"/>
         </view>
     </objects>
 </document>
diff --git a/ChartsDemo/Classes/Demos/AnotherBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/AnotherBarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib
index 546a6bd904..571312c92c 100644
--- a/ChartsDemo/Classes/Demos/AnotherBarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AnotherBarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AnotherBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="vfX-GJ-eSe" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="vfX-GJ-eSe" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="vfX-GJ-eSe" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="vfX-GJ-eSe" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="vfX-GJ-eSe" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="vfX-GJ-eSe" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="vfX-GJ-eSe" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="vfX-GJ-eSe"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/BarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib
similarity index 77%
rename from ChartsDemo/Classes/Demos/BarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib
index 2098f36e87..85dbdc8371 100644
--- a/ChartsDemo/Classes/Demos/BarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="GSz-bC-TWn" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="GSz-bC-TWn" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="GSz-bC-TWn" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="GSz-bC-TWn" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="GSz-bC-TWn" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="GSz-bC-TWn" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="GSz-bC-TWn" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="GSz-bC-TWn"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/BubbleChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/BubbleChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib
index 5883ff604f..03af886339 100644
--- a/ChartsDemo/Classes/Demos/BubbleChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart1ViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart1ViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BubbleChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="lva-Zq-pxQ" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="lva-Zq-pxQ" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="lva-Zq-pxQ" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="lva-Zq-pxQ" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="lva-Zq-pxQ" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="lva-Zq-pxQ" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="lva-Zq-pxQ" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="lva-Zq-pxQ"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/CandleStickChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/CandleStickChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib
index 2f814db531..460c052371 100644
--- a/ChartsDemo/Classes/Demos/CandleStickChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CandleStickChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CandleStickChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="CandleStickChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="qUE-H0-3LK" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="qUE-H0-3LK" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="qUE-H0-3LK" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="qUE-H0-3LK" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="qUE-H0-3LK" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="qUE-H0-3LK" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="qUE-H0-3LK" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="qUE-H0-3LK"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/ColoredLineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib
similarity index 67%
rename from ChartsDemo/Classes/Demos/ColoredLineChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib
index 7f92d45b88..ef099b9fd9 100644
--- a/ChartsDemo/Classes/Demos/ColoredLineChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11201"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13196"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ColoredLineChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ColoredLineChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
-                <outletCollection property="chartViews" destination="Oqd-Ej-1xl" id="3DD-X7-Fb3"/>
-                <outletCollection property="chartViews" destination="njk-0O-Wam" id="n3r-Fb-eC4"/>
-                <outletCollection property="chartViews" destination="9Lp-os-3Vt" id="vcK-0L-VT1"/>
-                <outletCollection property="chartViews" destination="nGo-AX-wvC" id="EH0-k2-fX4"/>
+                <outletCollection property="chartViews" destination="Oqd-Ej-1xl" collectionClass="NSMutableArray" id="3DD-X7-Fb3"/>
+                <outletCollection property="chartViews" destination="njk-0O-Wam" collectionClass="NSMutableArray" id="n3r-Fb-eC4"/>
+                <outletCollection property="chartViews" destination="9Lp-os-3Vt" collectionClass="NSMutableArray" id="vcK-0L-VT1"/>
+                <outletCollection property="chartViews" destination="nGo-AX-wvC" collectionClass="NSMutableArray" id="EH0-k2-fX4"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -21,37 +24,42 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="167"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="njk-0O-Wam" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="167" width="375" height="166.5"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Lp-os-3Vt" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="333.5" width="375" height="167"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nGo-AX-wvC" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="500.5" width="375" height="166.5"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="nGo-AX-wvC" secondAttribute="trailing" id="0yE-ju-Lag"/>
+                <constraint firstItem="YgW-AE-vxr" firstAttribute="trailing" secondItem="nGo-AX-wvC" secondAttribute="trailing" id="0yE-ju-Lag"/>
                 <constraint firstItem="njk-0O-Wam" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="145-vk-wcD"/>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="3NA-if-rAO"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
-                <constraint firstItem="nGo-AX-wvC" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="7QR-kC-1Ia"/>
-                <constraint firstAttribute="trailing" secondItem="njk-0O-Wam" secondAttribute="trailing" id="BeR-he-87z"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="YgW-AE-vxr" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="nGo-AX-wvC" firstAttribute="leading" secondItem="YgW-AE-vxr" secondAttribute="leading" id="7QR-kC-1Ia"/>
+                <constraint firstItem="YgW-AE-vxr" firstAttribute="trailing" secondItem="njk-0O-Wam" secondAttribute="trailing" id="BeR-he-87z"/>
                 <constraint firstItem="nGo-AX-wvC" firstAttribute="height" secondItem="9Lp-os-3Vt" secondAttribute="height" id="MSX-1T-Hcp"/>
                 <constraint firstItem="njk-0O-Wam" firstAttribute="height" secondItem="9Lp-os-3Vt" secondAttribute="height" id="Sfa-tz-95q"/>
                 <constraint firstItem="9Lp-os-3Vt" firstAttribute="top" secondItem="njk-0O-Wam" secondAttribute="bottom" id="V1f-0d-jnp"/>
-                <constraint firstItem="9Lp-os-3Vt" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Yea-IJ-jo4"/>
-                <constraint firstAttribute="trailing" secondItem="9Lp-os-3Vt" secondAttribute="trailing" id="hwF-Vk-0Oa"/>
-                <constraint firstItem="njk-0O-Wam" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="iEb-Yv-zMg"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
-                <constraint firstAttribute="bottom" secondItem="nGo-AX-wvC" secondAttribute="bottom" id="tGu-Tb-gOn"/>
+                <constraint firstItem="9Lp-os-3Vt" firstAttribute="leading" secondItem="YgW-AE-vxr" secondAttribute="leading" id="Yea-IJ-jo4"/>
+                <constraint firstItem="YgW-AE-vxr" firstAttribute="trailing" secondItem="9Lp-os-3Vt" secondAttribute="trailing" id="hwF-Vk-0Oa"/>
+                <constraint firstItem="njk-0O-Wam" firstAttribute="leading" secondItem="YgW-AE-vxr" secondAttribute="leading" id="iEb-Yv-zMg"/>
+                <constraint firstItem="YgW-AE-vxr" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="YgW-AE-vxr" firstAttribute="bottom" secondItem="nGo-AX-wvC" secondAttribute="bottom" id="tGu-Tb-gOn"/>
                 <constraint firstItem="njk-0O-Wam" firstAttribute="height" secondItem="Oqd-Ej-1xl" secondAttribute="height" id="wRR-If-cA5"/>
                 <constraint firstItem="nGo-AX-wvC" firstAttribute="top" secondItem="9Lp-os-3Vt" secondAttribute="bottom" id="zNN-fl-qjC"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="YgW-AE-vxr"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/CombinedChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib
similarity index 70%
rename from ChartsDemo/Classes/Demos/CombinedChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib
index 54477530db..82fe07e540 100644
--- a/ChartsDemo/Classes/Demos/CombinedChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CombinedChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CombinedChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -18,6 +26,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -28,18 +37,20 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="CombinedChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="620"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
-                <constraint firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="GrJ-LB-4th"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="bES-iI-k2Q" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="bES-iI-k2Q" firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="GrJ-LB-4th"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="bES-iI-k2Q" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="bES-iI-k2Q" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="bES-iI-k2Q"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/CubicLineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/CubicLineChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib
index a991036be4..007e470e21 100644
--- a/ChartsDemo/Classes/Demos/CubicLineChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CubicLineChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CubicLineChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="Wmu-Cs-mqH" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="Wmu-Cs-mqH" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="Wmu-Cs-mqH" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="Wmu-Cs-mqH" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="Wmu-Cs-mqH" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="Wmu-Cs-mqH" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="Wmu-Cs-mqH" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="Wmu-Cs-mqH"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/HalfPieChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib
similarity index 69%
rename from ChartsDemo/Classes/Demos/HalfPieChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib
index 29922a188a..cdcf1ffe65 100644
--- a/ChartsDemo/Classes/Demos/HalfPieChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HalfPieChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HalfPieChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -18,6 +26,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -28,18 +37,20 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="PieChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="561"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="d1B-K3-luU" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
-                <constraint firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="59" id="bih-r3-91f"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="d1B-K3-luU" firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="59" id="bih-r3-91f"/>
+                <constraint firstItem="d1B-K3-luU" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="d1B-K3-luU" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="d1B-K3-luU"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/HorizontalBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/HorizontalBarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib
index c2eca08e9b..7ea8e71202 100644
--- a/ChartsDemo/Classes/Demos/HorizontalBarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HorizontalBarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HorizontalBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="HorizontalBarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="oQj-WK-XAa" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="oQj-WK-XAa" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="oQj-WK-XAa" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="oQj-WK-XAa" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="oQj-WK-XAa" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="oQj-WK-XAa" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="oQj-WK-XAa" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="oQj-WK-XAa"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/LineChart1ViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib
index 84be1eb5de..9902b5b27d 100644
--- a/ChartsDemo/Classes/Demos/LineChart1ViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart1ViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart1ViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="1500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="150" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="TE7-or-dqL" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="TE7-or-dqL" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="TE7-or-dqL" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="TE7-or-dqL" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="TE7-or-dqL" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="TE7-or-dqL" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="TE7-or-dqL" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="TE7-or-dqL"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/LineChart2ViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/LineChart2ViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib
index c37e4dd5d0..c1c730e97b 100644
--- a/ChartsDemo/Classes/Demos/LineChart2ViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart2ViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart2ViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="C9T-x9-TAk" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="C9T-x9-TAk" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="C9T-x9-TAk" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="C9T-x9-TAk" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="C9T-x9-TAk" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="C9T-x9-TAk" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="C9T-x9-TAk" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="C9T-x9-TAk"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/LineChartFilledViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib
similarity index 77%
rename from ChartsDemo/Classes/Demos/LineChartFilledViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib
index 116668ae42..62bf7015e6 100644
--- a/ChartsDemo/Classes/Demos/LineChartFilledViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChartFilledViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChartFilledViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,19 +30,23 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="548"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="1500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="150" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -43,6 +55,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -54,20 +67,21 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="ItX-ja-gSm" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="ItX-ja-gSm" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="ItX-ja-gSm" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="ItX-ja-gSm" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="ItX-ja-gSm" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="ItX-ja-gSm" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="ItX-ja-gSm"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/LineChartTimeViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib
similarity index 77%
rename from ChartsDemo/Classes/Demos/LineChartTimeViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib
index 16b53d9d1b..d13233af3f 100644
--- a/ChartsDemo/Classes/Demos/LineChartTimeViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChartTimeViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChartTimeViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -20,6 +28,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -30,9 +39,11 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="539"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -41,6 +52,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="1500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
@@ -49,17 +61,18 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="kVP-q2-y6c" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstAttribute="bottom" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="26" id="LJN-HL-WtQ"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="kVP-q2-y6c" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="kVP-q2-y6c" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="kVP-q2-y6c" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="kVP-q2-y6c" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="kVP-q2-y6c"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/MultipleBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib
similarity index 85%
rename from ChartsDemo/Classes/Demos/MultipleBarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib
index 99fd12c09a..9ee6745abc 100644
--- a/ChartsDemo/Classes/Demos/MultipleBarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MultipleBarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MultipleBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -71,23 +76,24 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="wvT-lD-ed7" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="width" secondItem="vDG-Fm-61Z" secondAttribute="width" id="6Ew-lk-dgF"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="wvT-lD-ed7" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="wvT-lD-ed7" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="wvT-lD-ed7" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="wvT-lD-ed7" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="wvT-lD-ed7" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="wvT-lD-ed7" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="wvT-lD-ed7"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/MultipleLinesChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/MultipleLinesChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib
index 664ed9881c..c9595f1dc4 100644
--- a/ChartsDemo/Classes/Demos/MultipleLinesChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MultipleLinesChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MultipleLinesChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="Utf-CR-RJG" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="Utf-CR-RJG" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="Utf-CR-RJG" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="Utf-CR-RJG" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="Utf-CR-RJG" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="Utf-CR-RJG" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="Utf-CR-RJG" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="Utf-CR-RJG"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib
similarity index 70%
rename from ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib
index a2ce947ba2..ac24e0d3c9 100644
--- a/ChartsDemo/Classes/Demos/NegativeStackedBarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NegativeStackedBarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NegativeStackedBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -18,6 +26,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -28,18 +37,20 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="HorizontalBarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="620"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="h5W-Kc-0fi" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
-                <constraint firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="caj-8a-75N"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="h5W-Kc-0fi" firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="caj-8a-75N"/>
+                <constraint firstItem="h5W-Kc-0fi" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="h5W-Kc-0fi" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="h5W-Kc-0fi"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/PieChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib
similarity index 77%
rename from ChartsDemo/Classes/Demos/PieChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib
index 9561343870..39cce57ef3 100644
--- a/ChartsDemo/Classes/Demos/PieChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PieChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PieChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,16 +41,19 @@
                     </connections>
                 </button>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="25" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -50,6 +62,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -58,28 +71,30 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="PieChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="xe5-u1-w6v" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="xe5-u1-w6v" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="xe5-u1-w6v" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="xe5-u1-w6v" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="xe5-u1-w6v" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="xe5-u1-w6v" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="xe5-u1-w6v" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="xe5-u1-w6v"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/PiePolylineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib
similarity index 80%
rename from ChartsDemo/Classes/Demos/PiePolylineChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib
index 9ef36e8e63..c0bc4dbb86 100644
--- a/ChartsDemo/Classes/Demos/PiePolylineChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PiePolylineChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PiePolylineChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="anE-ka-ll7" id="BRq-3t-UUC"/>
                 <outlet property="sliderTextX" destination="lre-9A-Aye" id="4hp-s0-eLS"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Acu-Hm-ONQ">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,16 +41,19 @@
                     </connections>
                 </button>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="25" translatesAutoresizingMaskIntoConstraints="NO" id="ekR-nK-ppT">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="cIX-Vt-DyR"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="2id-KM-MqZ">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="hZJ-5h-ugC"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="n9H-fM-jsG">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="JgC-Vw-8li"/>
                         <constraint firstAttribute="height" constant="30" id="qzd-1L-bEO"/>
@@ -50,6 +62,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lre-9A-Aye">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="Ybz-Xr-teI"/>
                         <constraint firstAttribute="width" constant="70" id="pvO-Pm-Nqo"/>
@@ -58,6 +71,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="anE-ka-ll7" customClass="PieChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="25" id="XuT-Ui-Ria"/>
@@ -72,23 +86,24 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="2id-KM-MqZ" secondAttribute="bottom" constant="26" id="0AC-oM-f39"/>
-                <constraint firstItem="ekR-nK-ppT" firstAttribute="leading" secondItem="30c-YJ-tW9" secondAttribute="leading" constant="8" id="0Fb-4W-iQd"/>
+                <constraint firstItem="ekR-nK-ppT" firstAttribute="leading" secondItem="Fd3-fA-e03" secondAttribute="leading" constant="8" id="0Fb-4W-iQd"/>
                 <constraint firstItem="n9H-fM-jsG" firstAttribute="leading" secondItem="2id-KM-MqZ" secondAttribute="trailing" constant="8" id="0Yy-6X-Pdi"/>
                 <constraint firstItem="ekR-nK-ppT" firstAttribute="centerY" secondItem="lre-9A-Aye" secondAttribute="centerY" id="3D7-U1-VQM"/>
-                <constraint firstAttribute="trailing" secondItem="Acu-Hm-ONQ" secondAttribute="trailing" constant="8" id="IIg-R0-B3N"/>
-                <constraint firstAttribute="trailing" secondItem="lre-9A-Aye" secondAttribute="trailing" constant="8" id="Kd4-V3-hub"/>
+                <constraint firstItem="Fd3-fA-e03" firstAttribute="trailing" secondItem="Acu-Hm-ONQ" secondAttribute="trailing" constant="8" id="IIg-R0-B3N"/>
+                <constraint firstItem="Fd3-fA-e03" firstAttribute="trailing" secondItem="lre-9A-Aye" secondAttribute="trailing" constant="8" id="Kd4-V3-hub"/>
                 <constraint firstItem="n9H-fM-jsG" firstAttribute="centerY" secondItem="2id-KM-MqZ" secondAttribute="centerY" id="O0I-Eo-Qq5"/>
-                <constraint firstItem="anE-ka-ll7" firstAttribute="leading" secondItem="30c-YJ-tW9" secondAttribute="leading" id="RiV-Bw-HVx"/>
+                <constraint firstItem="anE-ka-ll7" firstAttribute="leading" secondItem="Fd3-fA-e03" secondAttribute="leading" id="RiV-Bw-HVx"/>
                 <constraint firstItem="2id-KM-MqZ" firstAttribute="top" secondItem="ekR-nK-ppT" secondAttribute="bottom" constant="8" id="TCF-2x-BF2"/>
                 <constraint firstItem="ekR-nK-ppT" firstAttribute="top" secondItem="anE-ka-ll7" secondAttribute="bottom" constant="25" id="VRh-6e-hvp"/>
                 <constraint firstItem="anE-ka-ll7" firstAttribute="top" secondItem="30c-YJ-tW9" secondAttribute="top" constant="47" id="cq6-Wq-JBT"/>
                 <constraint firstItem="ekR-nK-ppT" firstAttribute="top" secondItem="anE-ka-ll7" secondAttribute="bottom" constant="100" id="lym-Gz-c9p"/>
-                <constraint firstAttribute="trailing" secondItem="anE-ka-ll7" secondAttribute="trailing" id="n8e-xI-OiN"/>
+                <constraint firstItem="Fd3-fA-e03" firstAttribute="trailing" secondItem="anE-ka-ll7" secondAttribute="trailing" id="n8e-xI-OiN"/>
                 <constraint firstItem="lre-9A-Aye" firstAttribute="leading" secondItem="ekR-nK-ppT" secondAttribute="trailing" constant="8" id="pCP-XY-Sh8"/>
-                <constraint firstAttribute="trailing" secondItem="n9H-fM-jsG" secondAttribute="trailing" constant="8" id="rzb-88-LAf"/>
-                <constraint firstItem="2id-KM-MqZ" firstAttribute="leading" secondItem="30c-YJ-tW9" secondAttribute="leading" constant="8" id="sl2-pO-S2f"/>
+                <constraint firstItem="Fd3-fA-e03" firstAttribute="trailing" secondItem="n9H-fM-jsG" secondAttribute="trailing" constant="8" id="rzb-88-LAf"/>
+                <constraint firstItem="2id-KM-MqZ" firstAttribute="leading" secondItem="Fd3-fA-e03" secondAttribute="leading" constant="8" id="sl2-pO-S2f"/>
                 <constraint firstItem="Acu-Hm-ONQ" firstAttribute="top" secondItem="30c-YJ-tW9" secondAttribute="top" constant="4" id="wBl-J9-CLZ"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="Fd3-fA-e03"/>
             <variation key="default">
                 <mask key="constraints">
                     <exclude reference="lym-Gz-c9p"/>
diff --git a/ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib
similarity index 70%
rename from ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib
index 311a874345..365f7f6337 100644
--- a/ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PositiveNegativeBarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PositiveNegativeBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -18,6 +26,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -28,18 +37,20 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="620"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="g4H-1Z-8O1" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
-                <constraint firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="Wj3-hx-hFY"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="g4H-1Z-8O1" firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="Wj3-hx-hFY"/>
+                <constraint firstItem="g4H-1Z-8O1" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="g4H-1Z-8O1" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="g4H-1Z-8O1"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/RadarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib
similarity index 74%
rename from ChartsDemo/Classes/Demos/RadarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib
index fb3209f598..3e45cbe67d 100644
--- a/ChartsDemo/Classes/Demos/RadarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib
@@ -1,13 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RadarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RadarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -19,6 +28,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -29,25 +39,28 @@
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="YOUR PREFERENCES" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="91q-nl-kWu">
+                    <rect key="frame" x="83.5" y="66.5" width="208" height="25"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="21"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="RadarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="133.5" width="375" height="533.5"/>
                     <color key="backgroundColor" red="0.23529411764705882" green="0.25490196078431371" blue="0.32156862745098036" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.23529411759999999" green="0.25490196079999999" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="bottom" multiplier="0.2" id="3NA-if-rAO"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
-                <constraint firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="Cb0-QN-VFO"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="U0u-dc-rt0" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="U0u-dc-rt0" firstAttribute="bottom" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" id="Cb0-QN-VFO"/>
                 <constraint firstItem="91q-nl-kWu" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Gs0-CZ-bRs"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="91q-nl-kWu" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="bottom" multiplier="0.1" id="ffS-cp-Pm3"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="U0u-dc-rt0" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="U0u-dc-rt0" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="U0u-dc-rt0"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/RealmDemosViewController.xib b/ChartsDemo-iOS/XIBs/Demos/RealmDemosViewController.xib
similarity index 79%
rename from ChartsDemo/Classes/RealmDemosViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/RealmDemosViewController.xib
index 0d3788dd13..9e6861347a 100644
--- a/ChartsDemo/Classes/RealmDemosViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/RealmDemosViewController.xib
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RealmDemosViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RealmDemosViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
@@ -34,9 +39,10 @@ Please go to https://github.com/danielgindi/ChartsRealm and follow the instructi
             <constraints>
                 <constraint firstItem="X92-k4-Oz9" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="PmD-ST-eOi"/>
                 <constraint firstItem="X92-k4-Oz9" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="WeM-ZA-u7S"/>
-                <constraint firstItem="X92-k4-Oz9" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="16" id="nX1-IK-pQh"/>
-                <constraint firstAttribute="trailing" secondItem="X92-k4-Oz9" secondAttribute="trailing" constant="16" id="vfJ-xE-LAn"/>
+                <constraint firstItem="X92-k4-Oz9" firstAttribute="leading" secondItem="x4u-hY-XZP" secondAttribute="leading" constant="16" id="nX1-IK-pQh"/>
+                <constraint firstItem="x4u-hY-XZP" firstAttribute="trailing" secondItem="X92-k4-Oz9" secondAttribute="trailing" constant="16" id="vfJ-xE-LAn"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="x4u-hY-XZP"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/ScatterChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/ScatterChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib
index 8fb1ad6909..926e15c0df 100644
--- a/ChartsDemo/Classes/Demos/ScatterChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ScatterChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ScatterChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="ScatterChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="RHR-M6-ISe" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="RHR-M6-ISe" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="RHR-M6-ISe" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="RHR-M6-ISe" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="RHR-M6-ISe" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="RHR-M6-ISe" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="RHR-M6-ISe" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="RHR-M6-ISe"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/SinusBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib
similarity index 77%
rename from ChartsDemo/Classes/Demos/SinusBarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib
index 27fd60b479..e2c84ecf6f 100644
--- a/ChartsDemo/Classes/Demos/SinusBarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SinusBarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SinusBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="vDG-Fm-61Z" id="QD4-ZM-qh4"/>
@@ -20,6 +28,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -30,11 +39,13 @@
                     </connections>
                 </button>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="8000" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="e4C-sW-MYP"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -43,23 +54,25 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="539"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="7KQ-kC-t5g" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="7KQ-kC-t5g" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="A3Q-md-O7n"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="7KQ-kC-t5g" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="7KQ-kC-t5g" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="7KQ-kC-t5g" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="7KQ-kC-t5g"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Demos/StackedBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib
similarity index 78%
rename from ChartsDemo/Classes/Demos/StackedBarChartViewController.xib
rename to ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib
index c61b6170ca..cb9e5c20e2 100644
--- a/ChartsDemo/Classes/Demos/StackedBarChartViewController.xib
+++ b/ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StackedBarChartViewController">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StackedBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -22,6 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zdz-nd-u7k">
+                    <rect key="frame" x="289" y="4" width="78" height="35"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                     <inset key="contentEdgeInsets" minX="10" minY="7" maxX="10" maxY="7"/>
                     <state key="normal" title="Options">
@@ -32,19 +41,23 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                    <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
+                    <rect key="frame" x="6" y="573" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
                     </connections>
                 </slider>
                 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
+                    <rect key="frame" x="6" y="611" width="285" height="31"/>
                     <connections>
                         <action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
+                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -53,6 +66,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
+                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -64,22 +78,23 @@
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
-                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
-                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="6Mc-iO-BuY"/>
+                <constraint firstItem="IuK-nU-ZPT" firstAttribute="leading" secondItem="m1j-0o-WbZ" secondAttribute="leading" constant="8" id="66R-JE-JSc"/>
+                <constraint firstItem="Oqd-Ej-1xl" firstAttribute="leading" secondItem="m1j-0o-WbZ" secondAttribute="leading" id="6Mc-iO-BuY"/>
                 <constraint firstItem="IuK-nU-ZPT" firstAttribute="top" secondItem="Xhn-cI-Tqm" secondAttribute="bottom" constant="8" id="Aa8-g3-hZn"/>
                 <constraint firstAttribute="bottom" secondItem="IuK-nU-ZPT" secondAttribute="bottom" constant="26" id="B7P-HB-AG2"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="centerY" secondItem="IuK-nU-ZPT" secondAttribute="centerY" id="FQM-m5-jqx"/>
-                <constraint firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
-                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
+                <constraint firstItem="m1j-0o-WbZ" firstAttribute="trailing" secondItem="vDG-Fm-61Z" secondAttribute="trailing" constant="8" id="JaG-vb-Ax6"/>
+                <constraint firstItem="Xhn-cI-Tqm" firstAttribute="leading" secondItem="m1j-0o-WbZ" secondAttribute="leading" constant="8" id="LkY-Dx-7d6"/>
                 <constraint firstItem="Zdz-nd-u7k" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="4" id="QYu-uI-rC8"/>
                 <constraint firstItem="It4-Tc-0qK" firstAttribute="leading" secondItem="Xhn-cI-Tqm" secondAttribute="trailing" constant="8" id="TmF-V6-O8f"/>
-                <constraint firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
-                <constraint firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
+                <constraint firstItem="m1j-0o-WbZ" firstAttribute="trailing" secondItem="It4-Tc-0qK" secondAttribute="trailing" constant="8" id="eKh-bB-c2R"/>
+                <constraint firstItem="m1j-0o-WbZ" firstAttribute="trailing" secondItem="Zdz-nd-u7k" secondAttribute="trailing" constant="8" id="hkP-f4-aXC"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="centerY" secondItem="It4-Tc-0qK" secondAttribute="centerY" id="jxE-OZ-bpN"/>
-                <constraint firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
+                <constraint firstItem="m1j-0o-WbZ" firstAttribute="trailing" secondItem="Oqd-Ej-1xl" secondAttribute="trailing" id="mC3-xy-2CS"/>
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
+            <viewLayoutGuide key="safeArea" id="m1j-0o-WbZ"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>
diff --git a/ChartsDemo/Classes/Components/RadarMarkerView.xib b/ChartsDemo-iOS/XIBs/RadarMarkerView.xib
similarity index 80%
rename from ChartsDemo/Classes/Components/RadarMarkerView.xib
rename to ChartsDemo-iOS/XIBs/RadarMarkerView.xib
index a515cc9ca9..8ffdb62c0d 100644
--- a/ChartsDemo/Classes/Components/RadarMarkerView.xib
+++ b/ChartsDemo-iOS/XIBs/RadarMarkerView.xib
@@ -1,22 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+        </array>
+    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view opaque="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="RadarMarkerView" customModule="ChartsDemo">
+        <view opaque="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="RadarMarkerView" customModule="ChartsDemo" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="66" height="50"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="radar_marker.png" translatesAutoresizingMaskIntoConstraints="NO" id="L3P-FF-1zl">
-                    <frame key="frameInset" width="66" height="50"/>
+                    <rect key="frame" x="0.0" y="0.0" width="66" height="50"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="val" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="uTq-cO-p25">
+                    <rect key="frame" x="25.5" y="5.5" width="15.5" height="15.5"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="13"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj/project.pbxproj b/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj
similarity index 85%
rename from ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj/project.pbxproj
rename to ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj
index 6d5ea9e69f..ed178403e0 100644
--- a/ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj/project.pbxproj
+++ b/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj
@@ -33,25 +33,11 @@
 			remoteGlobalIDString = 06165F2E1D8110E600722320;
 			remoteInfo = ChartsTests;
 		};
-		0630AE741D812840008859B0 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0630AE691D812840008859B0 /* Charts.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 06B120D51D811E6200D14B02;
-			remoteInfo = ChartsRealm;
-		};
-		0630AE761D812840008859B0 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0630AE691D812840008859B0 /* Charts.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 06B120FF1D811F1600D14B02;
-			remoteInfo = ChartsRealmTests;
-		};
 		0630AE8E1D8128A5008859B0 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE691D812840008859B0 /* Charts.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 06165F231D8110E600722320;
+			remoteGlobalIDString = A58A4ED274A941CA248EA921;
 			remoteInfo = Charts;
 		};
 /* End PBXContainerItemProxy section */
@@ -71,12 +57,13 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		03780C7E1EA29C87005C11C8 /* PlaygroundChart.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = PlaygroundChart.playground; sourceTree = "<group>"; };
 		0630AE691D812840008859B0 /* Charts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Charts.xcodeproj; path = ../Charts.xcodeproj; sourceTree = "<group>"; };
 		5B9A0C391C83AB1800ED8ED8 /* BarDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarDemoViewController.swift; sourceTree = "<group>"; };
 		5B9A0C3B1C83AB2100ED8ED8 /* LineDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineDemoViewController.swift; sourceTree = "<group>"; };
 		5B9A0C3D1C83AB2B00ED8ED8 /* RadarDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarDemoViewController.swift; sourceTree = "<group>"; };
 		5B9A0C3F1C83AB3400ED8ED8 /* PieDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieDemoViewController.swift; sourceTree = "<group>"; };
-		65B3F63E1C73B4F5000983D0 /* ChartsDemo-OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		65B3F63E1C73B4F5000983D0 /* ChartsDemo-macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-macOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65B3F6411C73B4F5000983D0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		65B3F6451C73B4F5000983D0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		65B3F6481C73B4F5000983D0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -100,8 +87,6 @@
 			children = (
 				0630AE711D812840008859B0 /* Charts.framework */,
 				0630AE731D812840008859B0 /* ChartsTests.xctest */,
-				0630AE751D812840008859B0 /* ChartsRealm.framework */,
-				0630AE771D812840008859B0 /* ChartsRealmTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -120,8 +105,9 @@
 		65B3F6351C73B4F5000983D0 = {
 			isa = PBXGroup;
 			children = (
-				65B3F6401C73B4F5000983D0 /* ChartsDemo-OSX */,
+				65B3F6401C73B4F5000983D0 /* ChartsDemo-macOS */,
 				65B3F63F1C73B4F5000983D0 /* Products */,
+				03780C7E1EA29C87005C11C8 /* PlaygroundChart.playground */,
 				0630AE691D812840008859B0 /* Charts.xcodeproj */,
 			);
 			sourceTree = "<group>";
@@ -129,12 +115,12 @@
 		65B3F63F1C73B4F5000983D0 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				65B3F63E1C73B4F5000983D0 /* ChartsDemo-OSX.app */,
+				65B3F63E1C73B4F5000983D0 /* ChartsDemo-macOS.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		65B3F6401C73B4F5000983D0 /* ChartsDemo-OSX */ = {
+		65B3F6401C73B4F5000983D0 /* ChartsDemo-macOS */ = {
 			isa = PBXGroup;
 			children = (
 				5B9A0C381C83AB0600ED8ED8 /* Demos */,
@@ -143,15 +129,15 @@
 				65B3F6471C73B4F5000983D0 /* Main.storyboard */,
 				65B3F64A1C73B4F5000983D0 /* Info.plist */,
 			);
-			path = "ChartsDemo-OSX";
+			path = "ChartsDemo-macOS";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		65B3F63D1C73B4F5000983D0 /* ChartsDemo-OSX */ = {
+		65B3F63D1C73B4F5000983D0 /* ChartsDemo-macOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-OSX" */;
+			buildConfigurationList = 65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-macOS" */;
 			buildPhases = (
 				65B3F63A1C73B4F5000983D0 /* Sources */,
 				65B3F63B1C73B4F5000983D0 /* Frameworks */,
@@ -163,9 +149,9 @@
 			dependencies = (
 				0630AE8F1D8128A5008859B0 /* PBXTargetDependency */,
 			);
-			name = "ChartsDemo-OSX";
+			name = "ChartsDemo-macOS";
 			productName = "ChartsDemo-OSX";
-			productReference = 65B3F63E1C73B4F5000983D0 /* ChartsDemo-OSX.app */;
+			productReference = 65B3F63E1C73B4F5000983D0 /* ChartsDemo-macOS.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -175,18 +161,19 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = dcg;
 				TargetAttributes = {
 					65B3F63D1C73B4F5000983D0 = {
 						CreatedOnToolsVersion = 7.2.1;
 						LastSwiftMigration = 0800;
+						ProvisioningStyle = Manual;
 					};
 				};
 			};
-			buildConfigurationList = 65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-OSX" */;
+			buildConfigurationList = 65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-macOS" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -203,7 +190,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				65B3F63D1C73B4F5000983D0 /* ChartsDemo-OSX */,
+				65B3F63D1C73B4F5000983D0 /* ChartsDemo-macOS */,
 			);
 		};
 /* End PBXProject section */
@@ -223,20 +210,6 @@
 			remoteRef = 0630AE721D812840008859B0 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		0630AE751D812840008859B0 /* ChartsRealm.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = ChartsRealm.framework;
-			remoteRef = 0630AE741D812840008859B0 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		0630AE771D812840008859B0 /* ChartsRealmTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = ChartsRealmTests.xctest;
-			remoteRef = 0630AE761D812840008859B0 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -290,18 +263,27 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -329,6 +311,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -336,18 +319,27 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -368,6 +360,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -376,12 +369,16 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "ChartsDemo-OSX/Info.plist";
+				DEVELOPMENT_TEAM = "";
+				INFOPLIST_FILE = "$(SRCROOT)/ChartsDemo-macOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-OSX";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -390,19 +387,23 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "ChartsDemo-OSX/Info.plist";
+				DEVELOPMENT_TEAM = "";
+				INFOPLIST_FILE = "$(SRCROOT)/ChartsDemo-macOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-OSX";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-OSX" */ = {
+		65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-macOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				65B3F64B1C73B4F5000983D0 /* Debug */,
@@ -411,7 +412,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-OSX" */ = {
+		65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-macOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				65B3F64E1C73B4F5000983D0 /* Debug */,
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/AppDelegate.swift b/ChartsDemo-macOS/ChartsDemo-macOS/AppDelegate.swift
similarity index 100%
rename from ChartsDemo-OSX/ChartsDemo-OSX/AppDelegate.swift
rename to ChartsDemo-macOS/ChartsDemo-macOS/AppDelegate.swift
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json b/ChartsDemo-macOS/ChartsDemo-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from ChartsDemo-OSX/ChartsDemo-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to ChartsDemo-macOS/ChartsDemo-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Base.lproj/Main.storyboard b/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard
similarity index 98%
rename from ChartsDemo-OSX/ChartsDemo-OSX/Base.lproj/Main.storyboard
rename to ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard
index d03155d871..e1bbcb34b1 100644
--- a/ChartsDemo-OSX/ChartsDemo-OSX/Base.lproj/Main.storyboard
+++ b/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14105" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14105"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -11,11 +11,11 @@
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">
                     <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
                         <items>
-                            <menuItem title="ChartsDemo-OSX" id="1Xt-HY-uBw">
+                            <menuItem title="ChartsDemo-macOS" id="1Xt-HY-uBw">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="ChartsDemo-OSX" systemMenu="apple" id="uQy-DD-JDr">
+                                <menu key="submenu" title="ChartsDemo-macOS" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
-                                        <menuItem title="About ChartsDemo-OSX" id="5kV-Vb-QxS">
+                                        <menuItem title="About ChartsDemo-macOS" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@@ -29,7 +29,7 @@
                                             <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                                        <menuItem title="Hide ChartsDemo-OSX" keyEquivalent="h" id="Olw-nP-bQN">
+                                        <menuItem title="Hide ChartsDemo-macOS" keyEquivalent="h" id="Olw-nP-bQN">
                                             <connections>
                                                 <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
                                             </connections>
@@ -47,7 +47,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                                        <menuItem title="Quit ChartsDemo-OSX" keyEquivalent="q" id="4sb-4s-VLi">
+                                        <menuItem title="Quit ChartsDemo-macOS" keyEquivalent="q" id="4sb-4s-VLi">
                                             <connections>
                                                 <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
                                             </connections>
@@ -628,7 +628,7 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                                     <items>
-                                        <menuItem title="ChartsDemo-OSX Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                                        <menuItem title="ChartsDemo-macOS Help" keyEquivalent="?" id="FKE-Sm-Kum">
                                             <connections>
                                                 <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
                                             </connections>
@@ -656,6 +656,9 @@
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                         <rect key="contentRect" x="196" y="240" width="480" height="270"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+                        <connections>
+                            <outlet property="delegate" destination="B8D-0N-5wS" id="y92-Vh-2JJ"/>
+                        </connections>
                     </window>
                     <connections>
                         <segue destination="MdU-M1-yR2" kind="relationship" relationship="window.shadowedContentViewController" id="HCe-s7-mZF"/>
@@ -679,9 +682,12 @@
                         <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <font key="font" metaFont="message"/>
-                        <tabViewItems/>
+                        <connections>
+                            <outlet property="delegate" destination="MdU-M1-yR2" id="s53-W6-MQq"/>
+                        </connections>
                     </tabView>
                     <connections>
+                        <outlet property="tabView" destination="4aI-t7-jgI" id="H36-1r-bl2"/>
                         <segue destination="4fu-uG-om0" kind="relationship" relationship="tabItems" id="LFV-tq-WGj"/>
                         <segue destination="vkP-1b-D8k" kind="relationship" relationship="tabItems" id="gGD-RY-5OB"/>
                         <segue destination="CQR-9h-gXY" kind="relationship" relationship="tabItems" id="rqo-tR-9a7"/>
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/BarDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift
similarity index 64%
rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/BarDemoViewController.swift
rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift
index d6ebb2eb83..bf0d91c76c 100644
--- a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/BarDemoViewController.swift
+++ b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift
@@ -21,20 +21,32 @@ open class BarDemoViewController: NSViewController
         super.viewDidLoad()
         
         // Do any additional setup after loading the view.
-        let ys1 = Array(1..<10).map { x in return sin(Double(x) / 2.0 / 3.141 * 1.5) }
-        let ys2 = Array(1..<10).map { x in return cos(Double(x) / 2.0 / 3.141) }
+        let xArray = Array(1..<10)
+        let ys1 = xArray.map { x in return sin(Double(x) / 2.0 / 3.141 * 1.5) }
+        let ys2 = xArray.map { x in return cos(Double(x) / 2.0 / 3.141) }
         
         let yse1 = ys1.enumerated().map { x, y in return BarChartDataEntry(x: Double(x), y: y) }
         let yse2 = ys2.enumerated().map { x, y in return BarChartDataEntry(x: Double(x), y: y) }
         
         let data = BarChartData()
-        let ds1 = BarChartDataSet(values: yse1, label: "Hello")
+        let ds1 = BarChartDataSet(entries: yse1, label: "Hello")
         ds1.colors = [NSUIColor.red]
         data.addDataSet(ds1)
-        
-        let ds2 = BarChartDataSet(values: yse2, label: "World")
+
+        let ds2 = BarChartDataSet(entries: yse2, label: "World")
         ds2.colors = [NSUIColor.blue]
         data.addDataSet(ds2)
+
+        let barWidth = 0.4
+        let barSpace = 0.05
+        let groupSpace = 0.1
+        
+        data.barWidth = barWidth
+        self.barChartView.xAxis.axisMinimum = Double(xArray[0])
+        self.barChartView.xAxis.axisMaximum = Double(xArray[0]) + data.groupWidth(groupSpace: groupSpace, barSpace: barSpace) * Double(xArray.count)
+        // (0.4 + 0.05) * 2 (data set count) + 0.1 = 1
+        data.groupBars(fromX: Double(xArray[0]), groupSpace: groupSpace, barSpace: barSpace)
+
         self.barChartView.data = data
         
         self.barChartView.gridBackgroundColor = NSUIColor.white
@@ -42,12 +54,12 @@ open class BarDemoViewController: NSViewController
         self.barChartView.chartDescription?.text = "Barchart Demo"
     }
     
-    @IBAction func save(_ sender: AnyObject)
+    @IBAction func save(_ sender: Any)
     {
         let panel = NSSavePanel()
         panel.allowedFileTypes = ["png"]
         panel.beginSheetModal(for: self.view.window!) { (result) -> Void in
-            if result == NSFileHandlingPanelOKButton
+            if result.rawValue == NSFileHandlingPanelOKButton
             {
                 if let path = panel.url?.path
                 {
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/LineDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift
similarity index 91%
rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/LineDemoViewController.swift
rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift
index 7168f4de4c..5f555649d3 100644
--- a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/LineDemoViewController.swift
+++ b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift
@@ -28,11 +28,11 @@ open class LineDemoViewController: NSViewController
         let yse2 = ys2.enumerated().map { x, y in return ChartDataEntry(x: Double(x), y: y) }
         
         let data = LineChartData()
-        let ds1 = LineChartDataSet(values: yse1, label: "Hello")
+        let ds1 = LineChartDataSet(entries: yse1, label: "Hello")
         ds1.colors = [NSUIColor.red]
         data.addDataSet(ds1)
         
-        let ds2 = LineChartDataSet(values: yse2, label: "World")
+        let ds2 = LineChartDataSet(entries: yse2, label: "World")
         ds2.colors = [NSUIColor.blue]
         data.addDataSet(ds2)
         self.lineChartView.data = data
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/PieDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift
similarity index 64%
rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/PieDemoViewController.swift
rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift
index 743c45623c..5a566f58a8 100644
--- a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/PieDemoViewController.swift
+++ b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift
@@ -26,19 +26,19 @@ open class PieDemoViewController: NSViewController
         let yse1 = ys1.enumerated().map { x, y in return PieChartDataEntry(value: y, label: String(x)) }
         
         let data = PieChartData()
-        let ds1 = PieChartDataSet(values: yse1, label: "Hello")
+        let ds1 = PieChartDataSet(entries: yse1, label: "Hello")
         
         ds1.colors = ChartColorTemplates.vordiplom()
         
         data.addDataSet(ds1)
         
-        let paragraphStyle: NSMutableParagraphStyle = NSParagraphStyle.default().mutableCopy() as! NSMutableParagraphStyle
+        let paragraphStyle: NSMutableParagraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         paragraphStyle.lineBreakMode = .byTruncatingTail
         paragraphStyle.alignment = .center
         let centerText: NSMutableAttributedString = NSMutableAttributedString(string: "Charts\nby Daniel Cohen Gindi")
-        centerText.setAttributes([NSFontAttributeName: NSFont(name: "HelveticaNeue-Light", size: 15.0)!, NSParagraphStyleAttributeName: paragraphStyle], range: NSMakeRange(0, centerText.length))
-        centerText.addAttributes([NSFontAttributeName: NSFont(name: "HelveticaNeue-Light", size: 13.0)!, NSForegroundColorAttributeName: NSColor.gray], range: NSMakeRange(10, centerText.length - 10))
-        centerText.addAttributes([NSFontAttributeName: NSFont(name: "HelveticaNeue-LightItalic", size: 13.0)!, NSForegroundColorAttributeName: NSColor(red: 51 / 255.0, green: 181 / 255.0, blue: 229 / 255.0, alpha: 1.0)], range: NSMakeRange(centerText.length - 19, 19))
+        centerText.setAttributes([NSAttributedString.Key.font: NSFont(name: "HelveticaNeue-Light", size: 15.0)!, NSAttributedString.Key.paragraphStyle: paragraphStyle], range: NSMakeRange(0, centerText.length))
+        centerText.addAttributes([NSAttributedString.Key.font: NSFont(name: "HelveticaNeue-Light", size: 13.0)!, NSAttributedString.Key.foregroundColor: NSColor.gray], range: NSMakeRange(10, centerText.length - 10))
+        centerText.addAttributes([NSAttributedString.Key.font: NSFont(name: "HelveticaNeue-LightItalic", size: 13.0)!, NSAttributedString.Key.foregroundColor: NSColor(red: 51 / 255.0, green: 181 / 255.0, blue: 229 / 255.0, alpha: 1.0)], range: NSMakeRange(centerText.length - 19, 19))
         
         self.pieChartView.centerAttributedText = centerText
         
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/RadarDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift
similarity index 90%
rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/RadarDemoViewController.swift
rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift
index d9a0f0c43a..e147a2688c 100644
--- a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/RadarDemoViewController.swift
+++ b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift
@@ -28,11 +28,11 @@ open class RadarDemoViewController: NSViewController
         let yse2 = ys2.enumerated().map { x, y in return RadarChartDataEntry(value: y) }
         
         let data = RadarChartData()
-        let ds1 = RadarChartDataSet(values: yse1, label: "Hello")
+        let ds1 = RadarChartDataSet(entries: yse1, label: "Hello")
         ds1.colors = [NSUIColor.red]
         data.addDataSet(ds1)
         
-        let ds2 = RadarChartDataSet(values: yse2, label: "World")
+        let ds2 = RadarChartDataSet(entries: yse2, label: "World")
         ds2.colors = [NSUIColor.blue]
         data.addDataSet(ds2)
         self.radarChartView.data = data
diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Info.plist b/ChartsDemo-macOS/ChartsDemo-macOS/Info.plist
similarity index 100%
rename from ChartsDemo-OSX/ChartsDemo-OSX/Info.plist
rename to ChartsDemo-macOS/ChartsDemo-macOS/Info.plist
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Contents.o b/ChartsDemo-macOS/PlaygroundChart.playground/Contents.o
new file mode 100644
index 0000000000..e7a031a9a8
Binary files /dev/null and b/ChartsDemo-macOS/PlaygroundChart.playground/Contents.o differ
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..5845162bca
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,63 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Bar Chart
+//#-hidden-code
+import Cocoa
+import Charts
+import PlaygroundSupport
+//#-end-hidden-code
+
+
+let months = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+let values : [Double] = [28800, 32400, 36000, 34000, 30000, 42000, 45000]
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = BarChartView(frame: r)
+//: ### General
+chartView.pinchZoomEnabled          = false
+chartView.drawBarShadowEnabled      = false
+chartView.doubleTapToZoomEnabled    = false
+chartView.drawGridBackgroundEnabled = true
+chartView.fitBars                   = true
+//: ### BarChartDataEntry
+var yVals = [BarChartDataEntry]()
+for i in 0..<7
+{
+    yVals.append(BarChartDataEntry(x: Double(i), y: values[i]))
+}
+//: ### BarChartDataSet
+var set1 = BarChartDataSet()
+set1 = BarChartDataSet(values: yVals, label: "DataSet")
+set1.colors = ChartColorTemplates.vordiplom()
+set1.drawValuesEnabled = true
+
+var dataSets = [ChartDataSet]()
+dataSets.append(set1)
+//: ### BarChartData
+let data = BarChartData(dataSets: dataSets)
+chartView.data = data
+
+chartView.animate(xAxisDuration: 2.0, yAxisDuration: 2.0, easingOption: .easeInBounce)
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..0fc6d448e8
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,82 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous)
+ ****
+ */
+
+//: # Bubble Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+let ITEM_COUNT  = 20
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = BubbleChartView(frame: r)
+//: ### General
+chartView.drawGridBackgroundEnabled = true
+//: ### xAxis
+let xAxis                           = chartView.xAxis
+xAxis.labelPosition                 = .bothSided
+xAxis.axisMinimum                   = 0.0
+xAxis.granularity                   = 1.0
+//: ### LeftAxis
+let leftAxis                        = chartView.leftAxis
+leftAxis.drawGridLinesEnabled       = true
+leftAxis.axisMinimum                = 40.0
+//: ### RightAxis
+let rightAxis                       = chartView.rightAxis
+rightAxis.drawGridLinesEnabled      = true
+rightAxis.axisMinimum               = 40.0
+//: ### Legend
+let legend                          = chartView.legend
+legend.wordWrapEnabled              = true
+legend.horizontalAlignment          = .center
+legend.verticalAlignment            = .bottom
+legend.orientation                  = .horizontal
+legend.drawInside                   = false
+//: ### Description
+chartView.chartDescription?.enabled = false
+//: ### BubbleChartDataEntry
+var entries = [BubbleChartDataEntry]()
+for index in 0..<ITEM_COUNT
+{
+    let y = Double(arc4random_uniform(100)) + 50.0
+    let size = (y - 50) / 25.0
+    entries.append(BubbleChartDataEntry(x: Double(index) + 0.5, y: y, size: CGFloat(size)))
+}
+//: ### BubbleChartDataSet
+let set = BubbleChartDataSet(values: entries, label: "Bubble DataSet")
+set.colors = ChartColorTemplates.vordiplom()
+set.valueTextColor = NSUIColor.labelOrBlack
+set.valueFont = NSUIFont.systemFont(ofSize: CGFloat(10.0))
+set.drawValuesEnabled = true
+set.normalizeSizeEnabled = false
+//: ### BubbleChartData
+let data = BubbleChartData()
+data.addDataSet(set)
+chartView.data = data
+
+chartView.animate(xAxisDuration: 1.0, yAxisDuration: 1.0)
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous)
+ ****
+ */
+
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..9602421e62
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,96 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Candle Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+
+func randomFloatBetween(from: Float, to: Float)->Float
+{
+    return Float(arc4random_uniform( UInt32(to - from ))) + Float(from)
+}
+
+
+let ITEM_COUNT  = 20
+
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = CandleStickChartView(frame: r)
+//: ### General
+chartView.drawGridBackgroundEnabled = true
+//: ### xAxis
+let xAxis                           = chartView.xAxis
+xAxis.labelPosition                 = .bothSided
+xAxis.axisMinimum                   = 0.0
+xAxis.granularity                   = 1.0
+//: ### LeftAxis
+let leftAxis                        = chartView.leftAxis
+leftAxis.drawGridLinesEnabled       = true
+leftAxis.axisMinimum                = 0.0
+//: ### RightAxis
+let rightAxis                       = chartView.rightAxis
+rightAxis.drawGridLinesEnabled      = true
+rightAxis.axisMinimum               = 0.0
+//: ### Legend
+let legend                          = chartView.legend
+legend.wordWrapEnabled              = true
+legend.horizontalAlignment          = .center
+legend.verticalAlignment            = .bottom
+legend.orientation                  = .horizontal
+legend.drawInside                   = false
+//: ### Description
+chartView.chartDescription?.enabled = false
+//: ### CandleChartDataEntry
+var entries = [CandleChartDataEntry]()
+
+for i in 0..<ITEM_COUNT
+{
+    let mult: Float = 50
+    let val = randomFloatBetween(from: mult, to: mult + 40)
+    let high = randomFloatBetween(from: 8, to: 17)
+    let low: Float = randomFloatBetween(from: 8, to: 17)
+    let open: Float = randomFloatBetween(from: 1, to: 7)
+    let close: Float = randomFloatBetween(from: 1, to: 7)
+    let even: Bool = i % 2 == 0
+    
+    entries.append(CandleChartDataEntry(x: Double(i), shadowH: Double(val + high), shadowL: Double(val - low), open: Double(even ? val + open : val - open), close: Double(even ? val - close : val + close)))
+    }
+//: ### CandleChartDataSet
+let set = CandleChartDataSet(values: entries, label: "Candle DataSet")
+set.colors = [#colorLiteral(red: 0.313725490196078, green: 0.313725490196078, blue: 0.313725490196078, alpha: 1.0)]
+
+set.decreasingColor = #colorLiteral(red: 0.9529411793, green: 0.6862745285, blue: 0.1333333403, alpha: 1)
+set.shadowColor = NSColor.red
+set.valueFont = NSUIFont.systemFont(ofSize: CGFloat(10.0))
+set.drawValuesEnabled = true
+set.shadowWidth = 0.7
+//: ### CandleChartData
+let data = CandleChartData()
+data.addDataSet(set)
+chartView.data = data
+chartView.animate(xAxisDuration: 1.0, yAxisDuration: 1.0)
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
+
+
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..836928d903
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,150 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Combined Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+
+func setChartData()
+{
+    let data = CombinedChartData()
+    data.lineData = generateLineData()
+    data.barData = generateBarData()
+    chartView.xAxis.axisMaximum = data.xMax + 0.25
+    chartView.data = data
+}
+//: ## function generateLineData
+func generateLineData() -> LineChartData
+{
+//: ### ChartDataEntry
+    var entries = [ChartDataEntry]()
+    for index in 0..<ITEM_COUNT
+    {
+        entries.append(ChartDataEntry(x: Double(index) + 0.5, y: (Double(arc4random_uniform(15) + 5))))
+    }
+//: ### LineChartDataSet
+    let set = LineChartDataSet(values: entries, label: "Line DataSet")
+    set.colors = [#colorLiteral(red: 0.941176470588235, green: 0.933333333333333, blue: 0.274509803921569, alpha: 1.0)]
+    set.lineWidth = 2.5
+    set.circleColors = [#colorLiteral(red: 0.941176470588235, green: 0.933333333333333, blue: 0.274509803921569, alpha: 1.0)]
+    set.circleHoleRadius = 2.5
+    set.fillColor = #colorLiteral(red: 0.941176470588235, green: 0.933333333333333, blue: 0.274509803921569, alpha: 1.0)
+    set.mode = .cubicBezier
+    set.drawValuesEnabled = true
+    set.valueFont = NSUIFont.systemFont(ofSize: CGFloat(10.0))
+    set.valueTextColor = #colorLiteral(red: 0.941176470588235, green: 0.933333333333333, blue: 0.274509803921569, alpha: 1.0)
+    set.axisDependency = .left
+//: ### LineChartData
+    let data = LineChartData()
+    data.addDataSet(set)
+    return data
+}
+//: ## function generateBarData
+func generateBarData() -> BarChartData
+{
+//: ### BarChartDataEntry
+    var entries1 = [BarChartDataEntry]()
+    var entries2 = [BarChartDataEntry]()
+    
+    for _ in 0..<ITEM_COUNT
+    {
+        entries1.append(BarChartDataEntry(x: 0.0, y: (Double(arc4random_uniform(25) + 25))))
+/*:
+- Note: stacked
+*/
+        entries2.append(BarChartDataEntry(x: 0.0, yValues: [Double(arc4random_uniform(13) + 12), Double(arc4random_uniform(13) + 12)]))
+    }
+//: ### BarChartDataSet
+    let set1            = BarChartDataSet(values: entries1, label: "Bar 1")
+    set1.colors         = [#colorLiteral(red: 0.235294117647059, green: 0.862745098039216, blue: 0.305882352941176, alpha: 1.0)]
+    set1.valueTextColor = #colorLiteral(red: 0.235294117647059, green: 0.862745098039216, blue: 0.305882352941176, alpha: 1.0)
+    set1.valueFont      = NSUIFont.systemFont(ofSize: CGFloat(10.0))
+    set1.axisDependency = .left
+    
+    let set2            = BarChartDataSet(values: entries2, label: "Bar 2")
+    set2.stackLabels    = ["Stack 1", "Stack 2"]
+    set2.colors         = [#colorLiteral(red: 0.23921568627451, green: 0.647058823529412, blue: 1.0, alpha: 1.0),  #colorLiteral(red: 0.090196078431373, green: 0.772549019607843, blue: 1.0, alpha: 1.0)]
+    set2.valueTextColor = #colorLiteral(red: 0.23921568627451, green: 0.647058823529412, blue: 1.0, alpha: 1.0)
+    set2.valueFont      = NSUIFont.systemFont(ofSize: CGFloat(10.0))
+    set2.axisDependency = .left
+//: ### BarChartData
+    let groupSpace = 0.06
+    let barSpace = 0.02
+    let barWidth = 0.45
+    
+/*: 
+- Note:  x2 dataset
+(0.45 + 0.02) * 2 + 0.06 = 1.00 -> interval per "group"
+ */
+    let data = BarChartData(dataSets: [set1, set2])
+    data.barWidth = barWidth
+/*:
+- Note: make this BarData object grouped
+*/
+    data.groupBars(fromX: 0.0, groupSpace: groupSpace, barSpace: barSpace)     // start at x = 0
+    return data
+}
+//: ## Principal
+let ITEM_COUNT  = 12
+
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = CombinedChartView(frame: r)
+//: ### General
+chartView.drawGridBackgroundEnabled = false
+chartView.drawBarShadowEnabled      = false
+chartView.highlightFullBarEnabled   = false
+chartView.drawOrder                 = [DrawOrder.bar.rawValue, DrawOrder.bubble.rawValue, DrawOrder.candle.rawValue, DrawOrder.line.rawValue, DrawOrder.scatter.rawValue]
+//: ### xAxis
+let xAxis                           = chartView.xAxis
+xAxis.labelPosition                 = .bothSided
+xAxis.axisMinimum                   = 0.0
+xAxis.granularity                   = 1.0
+//xAxis.valueFormatter                = BarChartFormatter()
+//: ### LeftAxis
+let leftAxis                        = chartView.leftAxis
+leftAxis.drawGridLinesEnabled       = false
+leftAxis.axisMinimum                = 0.0
+//: ### RightAxis
+let rightAxis                       = chartView.rightAxis
+rightAxis.drawGridLinesEnabled      = false
+rightAxis.axisMinimum               = 0.0
+//: ### Legend
+let legend                          = chartView.legend
+legend.wordWrapEnabled              = true
+legend.horizontalAlignment          = .center
+legend.verticalAlignment            = .bottom
+legend.orientation                  = .horizontal
+legend.drawInside                   = false
+//: ### Description
+chartView.chartDescription?.enabled = false
+
+setChartData()
+chartView.animate(xAxisDuration: 2.0, yAxisDuration: 2.0, easingOption: .easeInBounce)
+
+/*:---*/
+//: ###  Setup for the live view
+PlaygroundPage.current.liveView = chartView
+
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
+
+
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..30db0670f4
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,102 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+  ****
+ */
+
+//: # Horizontal Bar Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = HorizontalBarChartView(frame: r)
+//: ### General
+chartView.drawBarShadowEnabled = false
+chartView.drawValueAboveBarEnabled = true
+chartView.maxVisibleCount = 60
+chartView.fitBars = true
+chartView.gridBackgroundColor = NSUIColor.white
+chartView.drawGridBackgroundEnabled = true
+//: ### xAxis
+let xAxis = chartView.xAxis
+xAxis.labelPosition = .bothSided
+xAxis.labelTextColor = #colorLiteral(red: 0, green: 0.9768045545, blue: 0, alpha: 1)
+xAxis.labelFont = NSUIFont.systemFont(ofSize: CGFloat(12.0))
+xAxis.drawAxisLineEnabled = true
+xAxis.drawGridLinesEnabled = true
+xAxis.granularity = 10.0
+//: ### LeftAxis
+let leftAxis = chartView.leftAxis
+leftAxis.labelFont = NSUIFont.systemFont(ofSize: CGFloat(12.0))
+leftAxis.labelTextColor = #colorLiteral(red: 0.01680417731, green: 0.1983509958, blue: 1, alpha: 1)
+leftAxis.drawAxisLineEnabled = true
+leftAxis.drawGridLinesEnabled = true
+leftAxis.axisMinimum = 0.0
+leftAxis.enabled = true
+//: ### RightAxis
+let rightAxis                  = chartView.rightAxis
+rightAxis.labelFont            = NSUIFont.systemFont(ofSize: CGFloat(12.0))
+rightAxis.labelTextColor        = #colorLiteral(red: 0.7450980544, green: 0.1568627506, blue: 0.07450980693, alpha: 1)
+rightAxis.drawAxisLineEnabled  = true
+rightAxis.drawGridLinesEnabled = false
+rightAxis.axisMinimum          = 0.0
+rightAxis.enabled              = true
+//: ### Legend
+let legend = chartView.legend
+legend.horizontalAlignment = .left
+legend.verticalAlignment = .bottom
+legend.orientation = .horizontal
+legend.drawInside = false
+legend.form = .square
+legend.formSize = 8.0
+legend.font = NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(11.0))!
+legend.xEntrySpace = 4.0
+
+//: ### Description
+chartView.chartDescription?.text = "Horizontal Bar Chart"
+//: ### BarChartDataEntry
+let count = 12
+let range = 50.0
+let barWidth = 9.0
+let spaceForBar = 10.0
+
+var yVals = [BarChartDataEntry]()
+for i in 0..<count
+{
+    let mult = range + 1.0
+    let val = Double(arc4random_uniform(UInt32(mult)))
+    yVals.append(BarChartDataEntry(x: Double(i) * spaceForBar, y: val))
+}
+//: ### BarChartDataSet
+var set1 = BarChartDataSet()
+set1 = BarChartDataSet(values: yVals, label: "DataSet")
+set1.colors = ChartColorTemplates.vordiplom()
+
+//: ### BarChartData
+let data            = BarChartData(dataSets: [set1])
+data.setValueFont(NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(10.0)))
+data.barWidth       = barWidth
+chartView.data = data
+
+chartView.animate(xAxisDuration: 1.0, yAxisDuration: 1.0)
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..572c73665e
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,157 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Line Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = LineChartView(frame: r)
+//: ### General
+chartView.dragEnabled = true
+chartView.setScaleEnabled ( true)
+chartView.drawGridBackgroundEnabled = false
+chartView.pinchZoomEnabled = true
+chartView.backgroundColor = #colorLiteral(red: 0.8039215803, green: 0.8039215803, blue: 0.8039215803, alpha: 1)
+chartView.borderColor = NSUIColor.black
+chartView.borderLineWidth = 1.0
+chartView.drawBordersEnabled = true
+//: ### xAxis
+let xAxis = chartView.xAxis
+xAxis.labelFont = NSUIFont.systemFont(ofSize: CGFloat(12.0))
+xAxis.labelTextColor = #colorLiteral(red: 0.1764705926, green: 0.01176470611, blue: 0.5607843399, alpha: 1)
+xAxis.drawGridLinesEnabled = true
+xAxis.drawAxisLineEnabled = true
+xAxis.labelPosition = .bottom
+xAxis.labelRotationAngle = 0
+xAxis.axisMinimum = 0
+//: ### LeftAxis
+let leftAxis = chartView.leftAxis
+leftAxis.labelTextColor = #colorLiteral(red: 0.215686274509804, green: 0.709803921568627, blue: 0.898039215686275, alpha: 1.0)
+leftAxis.axisMaximum = 200.0
+leftAxis.axisMinimum = 0.0
+leftAxis.drawGridLinesEnabled = true
+leftAxis.drawZeroLineEnabled = false
+leftAxis.granularityEnabled = true
+//: ### RightAxis
+let rightAxis = chartView.rightAxis
+rightAxis.labelTextColor = #colorLiteral(red: 1, green: 0.1474981606, blue: 0, alpha: 1)
+rightAxis.axisMaximum = 900.0
+rightAxis.axisMinimum = -200.0
+rightAxis.drawGridLinesEnabled = false
+rightAxis.granularityEnabled = false
+//: ### Legend
+let legend = chartView.legend
+legend.font = NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(12.0))!
+legend.textColor = NSUIColor.labelOrBlack
+legend.form = .square
+legend.drawInside = false
+legend.orientation = .horizontal
+legend.verticalAlignment = .bottom
+legend.horizontalAlignment = .left
+//: ### Description
+chartView.chartDescription?.enabled = false
+//: ### ChartDataEntry
+var yVals1 = [ChartDataEntry]()
+var yVals2 = [ChartDataEntry]()
+var yVals3 = [ChartDataEntry]()
+
+let range = 30.0
+
+for i in 0..<20 {
+    let mult: Double = range / 2.0
+    let val = Double(arc4random_uniform(UInt32(mult))) + 50
+    yVals1.append(ChartDataEntry(x: Double(i), y: val))
+}
+
+for i in 0..<20 - 1 {
+    let mult: Double = range
+    let val = Double(arc4random_uniform(UInt32(mult))) + 450
+    yVals2.append(ChartDataEntry(x: Double(i), y: val))
+}
+
+for i in 0..<20 {
+    let mult: Double = range
+    let val = Double(arc4random_uniform(UInt32(mult))) + 500
+    yVals3.append(ChartDataEntry(x: Double(i), y: val))
+}
+
+var set1 = LineChartDataSet()
+var set2 = LineChartDataSet()
+var set3 = LineChartDataSet()
+
+set1 = LineChartDataSet(values: yVals1, label: "DataSet 1")
+set1.axisDependency = .left
+set1.colors = [#colorLiteral(red: 0.215686274509804, green: 0.709803921568627, blue: 0.898039215686275, alpha: 1.0)]
+set1.circleColors = [NSUIColor.white]
+set1.lineWidth = 2.0
+set1.circleRadius = 3.0
+set1.fillAlpha = 65 / 255.0
+set1.fillColor = #colorLiteral(red: 0.215686274509804, green: 0.709803921568627, blue: 0.898039215686275, alpha: 1.0)
+set1.highlightColor = NSUIColor.blue
+set1.highlightEnabled = true
+set1.drawCircleHoleEnabled = false
+
+
+set2 = LineChartDataSet(values: yVals2, label: "DataSet 2")
+set2.axisDependency = .right
+set2.colors = [NSUIColor.red]
+set2.circleColors = [NSUIColor.white]
+set2.lineWidth = 2.0
+set2.circleRadius = 3.0
+set2.fillAlpha = 65 / 255.0
+set2.fillColor = NSUIColor.red
+set2.highlightColor = NSUIColor.red
+set2.highlightEnabled = true
+set2.drawCircleHoleEnabled = false
+
+set3 = LineChartDataSet(values: yVals3, label: "DataSet 3")
+set3.axisDependency = .right
+set3.colors = [NSUIColor.green]
+set3.circleColors = [NSUIColor.white]
+set3.lineWidth = 2.0
+set3.circleRadius = 3.0
+set3.fillAlpha = 65 / 255.0
+set3.fillColor = NSUIColor.yellow.withAlphaComponent(200 / 255.0)
+set3.highlightColor = NSUIColor.green
+set3.highlightEnabled = true
+set3.drawCircleHoleEnabled = false
+
+var dataSets = [LineChartDataSet]()
+dataSets.append(set1)
+dataSets.append(set2)
+dataSets.append(set3)
+//: ### LineChartData
+let data = LineChartData(dataSets: dataSets)
+data.setValueTextColor(#colorLiteral(red: 1, green: 1, blue: 1, alpha: 1))
+data.setValueFont(NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(9.0)))
+chartView.data = data
+
+chartView.data?.notifyDataChanged()
+chartView.notifyDataSetChanged()
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+
+
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..eb4b8a5dc1
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift
@@ -0,0 +1,40 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ 
+ ![Playground icon](feature_graphic.png)
+ 
+ 
+ # Table of contents
+ 
+ * [Line Chart](LineChart)
+ 
+ * [Bar Chart](BarChart)
+ 
+ * [Pie Chart](PieChart)
+ 
+ * [Radar Chart](RadarChart)
+ 
+ * [Scatter Chart](ScatterChart)
+ 
+ * [Combined Chart](CombinedChart)
+ 
+ * [Horizontal Chart](HorizontalBarChart)
+ 
+ * [Candle Chart](CandleChart)
+ 
+ * [Stacked Bar Chart](StackedBarChart)
+ 
+ * [Bubble Chart](BubbleChart)
+ 
+ 
+ */
+//: [Next Chart](@next)
+
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png
new file mode 100644
index 0000000000..ba0a65998d
Binary files /dev/null and b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png differ
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..191e752240
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,57 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Pie Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = PieChartView(frame: r)
+//: ### General
+let paragraphStyle: NSMutableParagraphStyle = NSParagraphStyle.default().mutableCopy() as! NSMutableParagraphStyle
+paragraphStyle.lineBreakMode = .byTruncatingTail
+paragraphStyle.alignment = .center
+
+let centerText: NSMutableAttributedString = NSMutableAttributedString(string: "Charts\nby Daniel Cohen Gindi")
+centerText.setAttributes([NSFontAttributeName: NSUIFont(name: "HelveticaNeue-Light", size: 15.0)!, NSParagraphStyleAttributeName: paragraphStyle], range: NSMakeRange(0, centerText.length))
+centerText.addAttributes([NSFontAttributeName: NSUIFont(name: "HelveticaNeue-Light", size: 13.0)!, NSForegroundColorAttributeName: NSUIColor.gray], range: NSMakeRange(10, centerText.length - 10))
+centerText.addAttributes([NSFontAttributeName: NSUIFont(name: "HelveticaNeue-LightItalic", size: 13.0)!, NSForegroundColorAttributeName: NSUIColor(red: 51 / 255.0, green: 181 / 255.0, blue: 229 / 255.0, alpha: 1.0)], range: NSMakeRange(centerText.length - 19, 19))
+
+chartView.centerAttributedText = centerText
+chartView.chartDescription?.text = "Pie Chart"
+//: ### PieChartDataEntry
+let ys1 = Array(1..<10).map { x in return sin(Double(x) / 2.0 / 3.141 * 1.5) * 100.0 }
+let yse1 = ys1.enumerated().map { x, y in return PieChartDataEntry(value: y, label: String(x)) }
+//: ### PieChartDataSet
+let ds1 = PieChartDataSet(values: yse1, label: "Hello")
+ds1.colors = ChartColorTemplates.vordiplom()
+//: ### PieChartData
+let data = PieChartData()
+data.addDataSet(ds1)
+chartView.data = data
+
+chartView.animate(xAxisDuration: 2.0, yAxisDuration: 2.0, easingOption: .easeInBounce)
+
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..f89381e68b
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,111 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Radar Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = RadarChartView(frame: r)
+//: ### General
+chartView.backgroundColor = #colorLiteral(red: 0.2605174184, green: 0.2605243921, blue: 0.260520637, alpha: 1)
+chartView.webLineWidth = 1.0
+chartView.innerWebLineWidth = 1.0
+chartView.webColor = NSUIColor.lightGray
+chartView.innerWebColor = NSUIColor.lightGray
+chartView.webAlpha = 1.0
+//: ### xAxis
+let xAxis = chartView.xAxis
+xAxis.labelFont = NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(9.0))!
+xAxis.xOffset = 0.0
+xAxis.yOffset = 0.0
+xAxis.labelTextColor = NSUIColor.white
+//: ### yAxis
+let yAxis = chartView.yAxis
+yAxis.labelFont = NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(9.0))!
+yAxis.labelCount = 5
+yAxis.axisMinimum = 0.0
+yAxis.axisMaximum = 80.0
+yAxis.drawLabelsEnabled = false
+//: ### Legend
+let legend = chartView.legend
+legend.horizontalAlignment = .center
+legend.verticalAlignment = .top
+legend.orientation = .horizontal
+legend.drawInside = false
+legend.font = NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(10.0))!
+legend.xEntrySpace = 7.0
+legend.yEntrySpace = 5.0
+legend.textColor = NSUIColor.white
+//: ### Description
+chartView.chartDescription?.enabled = true
+chartView.chartDescription?.text = "Radar demo"
+chartView.chartDescription?.textColor = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1)
+//: ### RadarChartDataEntry
+let mult = 80.0
+let min = 20.0
+let cnt = 5
+
+var entries1 = [RadarChartDataEntry]()
+var entries2 = [RadarChartDataEntry]()
+/*:
+- Note: The order of the entries when being added to the entries array determines their position around the center of the chart.
+*/
+for _ in 0..<cnt
+{
+    entries1.append(RadarChartDataEntry(value: (Double(arc4random_uniform(UInt32(mult))) + min)))
+    entries2.append(RadarChartDataEntry(value: (Double(arc4random_uniform(UInt32(mult))) + min)))
+}
+//: ### RadarChartDataSet
+let set1 = RadarChartDataSet(values: entries1, label: "Last Week")
+set1.colors = [NSUIColor(red: CGFloat(103 / 255.0), green: CGFloat(110 / 255.0), blue: CGFloat(129 / 255.0), alpha: 1.0)]
+set1.fillColor = NSUIColor(red: CGFloat(103 / 255.0), green: CGFloat(110 / 255.0), blue: CGFloat(129 / 255.0), alpha: 1.0)
+set1.drawFilledEnabled = true
+set1.fillAlpha = 0.7
+set1.lineWidth = 2.0
+set1.drawHighlightCircleEnabled = true
+set1.setDrawHighlightIndicators(false)
+
+let set2 = RadarChartDataSet(values: entries2, label: "This Week")
+set2.colors = [NSUIColor(red: CGFloat(121 / 255.0), green: CGFloat(162 / 255.0), blue: CGFloat(175 / 255.0), alpha: 1.0)]
+set2.fillColor = NSUIColor(red: CGFloat(121 / 255.0), green: CGFloat(162 / 255.0), blue: CGFloat(175 / 255.0), alpha: 1.0)
+set2.drawFilledEnabled = true
+set2.fillAlpha = 0.7
+set2.lineWidth = 2.0
+set2.drawHighlightCircleEnabled = true
+set2.setDrawHighlightIndicators(false)
+//: ### RadarChartData
+let data = RadarChartData(dataSets: [set1, set2])
+data.setValueFont ( NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(8.0)))
+data.setDrawValues ( false )
+data.setValueTextColor(  NSUIColor.white)
+chartView.data = data
+
+chartView.animate(xAxisDuration: 2.0, yAxisDuration: 2.0, easingOption: .easeInBounce)
+
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+
+
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
+
+
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..8a6252bfc0
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,104 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Scatter Chart
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = ScatterChartView(frame: r)
+//: ### General
+chartView.drawGridBackgroundEnabled = false
+chartView.setScaleEnabled ( true)
+chartView.maxVisibleCount = 200
+//: ### xAxis
+let xAxis = chartView.xAxis
+xAxis.labelFont = NSUIFont(name: "HelveticaNeue-Light", size: 10.0)!
+xAxis.drawGridLinesEnabled = true
+//: ### LeftAxis
+let leftAxis = chartView.leftAxis
+leftAxis.labelFont = NSUIFont(name: "HelveticaNeue-Light", size: 10.0)!
+leftAxis.axisMinimum = 0.0
+//: ### RightAxis
+chartView.rightAxis.enabled = false
+//: ### Legend
+let legend = chartView.legend
+legend.horizontalAlignment = .right
+legend.verticalAlignment = .top
+legend.orientation = .vertical
+legend.drawInside = false
+legend.font = NSUIFont(name: "HelveticaNeue-Light", size: 10.0)!
+legend.xOffset = 5.0
+//: ### Description
+chartView.chartDescription?.enabled = false
+//: ### ChartDataEntry
+let count = 25
+let range = 100.0
+
+var yVals1 = [ChartDataEntry]()
+var yVals2 = [ChartDataEntry]()
+var yVals3 = [ChartDataEntry]()
+
+for i in 0..<count
+{
+    var val = Double(arc4random_uniform(UInt32(range))) + 3
+    yVals1.append(ChartDataEntry(x: Double(i), y: val))
+    val = Double(arc4random_uniform(UInt32(range))) + 3
+    yVals2.append(ChartDataEntry(x: Double(i) + 0.33, y: val))
+    val = Double(arc4random_uniform(UInt32(range))) + 3
+    yVals3.append(ChartDataEntry(x: Double(i) + 0.66, y: val))
+}
+//: ### ScatterChartDataSet
+let set1 = ScatterChartDataSet(values: yVals1, label: "DS 1")
+set1.setScatterShape(.square )
+set1.colors =  ChartColorTemplates.liberty()
+set1.scatterShapeSize = 10.0
+
+let set2 = ScatterChartDataSet(values: yVals2, label: "DS 2")
+set2.setScatterShape( .circle)
+set2.scatterShapeHoleColor = NSUIColor.blue
+set2.scatterShapeHoleRadius = 3.5
+set2.colors = ChartColorTemplates.material()
+set2.scatterShapeSize = 10.0
+
+let set3 = ScatterChartDataSet(values: yVals3, label: "DS 3")
+set3.setScatterShape(.triangle)
+set3.colors = [NSUIColor.orange] //ChartColorTemplates.pastel()
+set3.scatterShapeSize = 10.0
+
+var dataSets = [ScatterChartDataSet]()
+dataSets.append(set1)
+dataSets.append(set2)
+dataSets.append(set3)
+//: ### ScatterChartData
+let data = ScatterChartData(dataSets: dataSets)
+data.setValueFont( NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(7.0)))
+chartView.data = data
+
+chartView.animate(xAxisDuration: 2.0, yAxisDuration: 2.0, easingOption: .easeInBounce)
+
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
+
+
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift
new file mode 100644
index 0000000000..99a6437168
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift
@@ -0,0 +1,116 @@
+//
+//  PlayGround
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  Copyright © 2017 thierry Hentic.
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/ios-charts
+/*:
+ ****
+ [Menu](Menu)
+ 
+ [Previous](@previous) | [Next](@next)
+ ****
+ */
+
+//: # Stacked Bar
+import Cocoa
+import Charts
+import PlaygroundSupport
+
+
+let r = CGRect(x: 0, y: 0, width: 600, height: 600)
+var chartView = HorizontalBarChartView(frame: r)
+//: ### General
+chartView.drawBarShadowEnabled = false
+chartView.drawValueAboveBarEnabled = false
+chartView.maxVisibleCount = 60
+chartView.fitBars = true
+chartView.gridBackgroundColor = NSUIColor.white
+chartView.drawGridBackgroundEnabled = true
+//: ### xAxis
+let xAxis = chartView.xAxis
+xAxis.labelPosition = .bothSided
+xAxis.labelTextColor = #colorLiteral(red: 0.01680417731, green: 0.1983509958, blue: 1, alpha: 1)
+xAxis.labelFont = NSUIFont.systemFont(ofSize: CGFloat(12.0))
+xAxis.drawAxisLineEnabled = true
+xAxis.drawGridLinesEnabled = true
+xAxis.granularity = 1.0
+xAxis.avoidFirstLastClippingEnabled = false
+//: ### LeftAxis
+let leftAxis = chartView.leftAxis
+leftAxis.labelFont = NSUIFont.systemFont(ofSize: CGFloat(12.0))
+leftAxis.labelTextColor = #colorLiteral(red: 0, green: 0.9768045545, blue: 0, alpha: 1)
+leftAxis.drawAxisLineEnabled = false
+leftAxis.drawGridLinesEnabled = true
+leftAxis.axisMinimum = 0.0
+leftAxis.enabled = true
+leftAxis.spaceTop    = 0.0
+leftAxis.spaceBottom = 0.0
+//: ### RightAxis
+let rightAxis                  = chartView.rightAxis
+rightAxis.labelFont            = NSUIFont.systemFont(ofSize: CGFloat(12.0))
+rightAxis.labelTextColor        = #colorLiteral(red: 0.7450980544, green: 0.1568627506, blue: 0.07450980693, alpha: 1)
+rightAxis.drawAxisLineEnabled  = true
+rightAxis.drawGridLinesEnabled = true
+rightAxis.axisMinimum          = 0.0
+rightAxis.enabled              = true
+rightAxis.spaceTop    = 0.5
+rightAxis.spaceBottom = 0.5
+//: ### Legend
+let legend = chartView.legend
+legend.horizontalAlignment = .left
+legend.verticalAlignment = .bottom
+legend.orientation = .horizontal
+legend.drawInside = false
+legend.form = .square
+legend.formSize = 8.0
+legend.font = NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(11.0))!
+legend.xEntrySpace = 4.0
+//: ### Description
+chartView.chartDescription?.text = "Horizontal Bar Chart"
+//: ### BarChartDataEntry
+let count = 12
+let range =  100.0
+let mult = 30.0
+
+var yVals = [ChartDataEntry]()
+for i in 0..<count
+{
+
+    let val1 = Double(arc4random_uniform(UInt32(mult)))
+    let val2 = Double(arc4random_uniform(UInt32(mult)))
+    let val3 = 100.0 - val1 - val2
+    yVals.append(BarChartDataEntry(x: Double(i), yValues: [val1, val2, val3]))
+}
+//: ### BarChartDataSet
+var set1 =  BarChartDataSet()
+let formatter = NumberFormatter()
+formatter.maximumFractionDigits = 1
+formatter.negativeSuffix = " %"
+formatter.positiveSuffix = " %"
+
+set1 = BarChartDataSet(values: yVals, label: "Stack")
+set1.colors = [ChartColorTemplates.material()[0], ChartColorTemplates.material()[1], ChartColorTemplates.material()[2]]
+set1.valueFont = NSUIFont(name: "HelveticaNeue-Light", size: CGFloat(10.0))!
+set1.valueFormatter = DefaultValueFormatter(formatter: formatter )
+set1.valueTextColor = NSUIColor.white
+set1.stackLabels = ["stack1", "stack2", "stack3"]
+
+var dataSets = [BarChartDataSet]()
+dataSets.append(set1)
+//: ### BarChartData
+let data = BarChartData()
+data.addDataSet(dataSets[0] )
+chartView.fitBars = true
+chartView.data = data
+/*:---*/
+//: ### Setup for the live view
+PlaygroundPage.current.liveView = chartView
+
+/*:
+ ****
+ [Previous](@previous) | [Next](@next)
+ */
diff --git a/ChartsDemo-macOS/PlaygroundChart.playground/contents.xcplayground b/ChartsDemo-macOS/PlaygroundChart.playground/contents.xcplayground
new file mode 100644
index 0000000000..141e9cc8ad
--- /dev/null
+++ b/ChartsDemo-macOS/PlaygroundChart.playground/contents.xcplayground
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='6.0' target-platform='macos' display-mode='rendered'>
+    <pages>
+        <page name='Menu'/>
+        <page name='BarChart'/>
+        <page name='LineChart'/>
+        <page name='PieChart'/>
+        <page name='RadarChart'/>
+        <page name='ScatterChart'/>
+        <page name='CombinedChart'/>
+        <page name='HorizontalBarChart'/>
+        <page name='CandleChart'/>
+        <page name='StackedBarChart'/>
+        <page name='BubbleChart'/>
+    </pages>
+</playground>
\ No newline at end of file
diff --git a/ChartsDemo/Classes/RealmDemosViewController.h b/ChartsDemo/Classes/RealmDemosViewController.h
deleted file mode 100644
index d73426e995..0000000000
--- a/ChartsDemo/Classes/RealmDemosViewController.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  RealmDemosViewController.h
-//  ChartsDemo
-//
-//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
-//  A port of MPAndroidChart for iOS
-//  Licensed under Apache License 2.0
-//
-//  https://github.com/danielgindi/Charts
-//
-
-#import <UIKit/UIKit.h>
-#import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
-
-@interface RealmDemosViewController : DemoBaseViewController
-
-@end
diff --git a/ChartsDemo/Classes/RealmDemosViewController.m b/ChartsDemo/Classes/RealmDemosViewController.m
deleted file mode 100644
index 52b7811661..0000000000
--- a/ChartsDemo/Classes/RealmDemosViewController.m
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  RealmDemosViewController.m
-//  ChartsDemo
-//
-//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
-//  A port of MPAndroidChart for iOS
-//  Licensed under Apache License 2.0
-//
-//  https://github.com/danielgindi/Charts
-//
-
-#import "RealmDemosViewController.h"
-#import "ChartsDemo-Swift.h"
-
-@interface RealmDemosViewController () <ChartViewDelegate>
-
-@end
-
-@implementation RealmDemosViewController
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    self.title = @"Realm demos";
-    
-}
-
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-@end
diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png b/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png
deleted file mode 100644
index 33b2e63ab4..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png b/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png
deleted file mode 100644
index ef18aba824..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
deleted file mode 100644
index 775e7277c8..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
deleted file mode 100644
index df4daf6e9d..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
deleted file mode 100644
index df4daf6e9d..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
deleted file mode 100644
index 14dd95b4a6..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json b/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
deleted file mode 100644
index 205398ad48..0000000000
--- a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "images" : [
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "Default-736h@3x.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "667h",
-      "filename" : "Default-667h@2x.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "filename" : "Default@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
-      "filename" : "Default-568h@2x.png",
-      "minimum-system-version" : "7.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
deleted file mode 100644
index 25a46804f7..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png
deleted file mode 100644
index a3bc101148..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-736h@3x.png b/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-736h@3x.png
deleted file mode 100644
index cd359b756e..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default-736h@3x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default@2x.png b/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default@2x.png
deleted file mode 100644
index 16802b260b..0000000000
Binary files a/ChartsDemo/Resources/Images.xcassets/LaunchImage.launchimage/Default@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/app-icon/iTunesArtwork b/ChartsDemo/Resources/app-icon/iTunesArtwork
deleted file mode 100644
index 2429a7ef03..0000000000
Binary files a/ChartsDemo/Resources/app-icon/iTunesArtwork and /dev/null differ
diff --git a/ChartsDemo/Resources/app-icon/iTunesArtwork@2x b/ChartsDemo/Resources/app-icon/iTunesArtwork@2x
deleted file mode 100644
index c55f117d42..0000000000
Binary files a/ChartsDemo/Resources/app-icon/iTunesArtwork@2x and /dev/null differ
diff --git a/ChartsDemo/Resources/launch-image/Default-568h@2x.png b/ChartsDemo/Resources/launch-image/Default-568h@2x.png
deleted file mode 100755
index 25a46804f7..0000000000
Binary files a/ChartsDemo/Resources/launch-image/Default-568h@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/launch-image/Default-667h@2x.png b/ChartsDemo/Resources/launch-image/Default-667h@2x.png
deleted file mode 100755
index a3bc101148..0000000000
Binary files a/ChartsDemo/Resources/launch-image/Default-667h@2x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/launch-image/Default-736h@3x.png b/ChartsDemo/Resources/launch-image/Default-736h@3x.png
deleted file mode 100755
index cd359b756e..0000000000
Binary files a/ChartsDemo/Resources/launch-image/Default-736h@3x.png and /dev/null differ
diff --git a/ChartsDemo/Resources/launch-image/Default@2x.png b/ChartsDemo/Resources/launch-image/Default@2x.png
deleted file mode 100755
index 16802b260b..0000000000
Binary files a/ChartsDemo/Resources/launch-image/Default@2x.png and /dev/null differ
diff --git a/Gemfile b/Gemfile
index 698f848aae..89b2efafcf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rake"
-gem "xcpretty"
-gem "cocoapods"
+gem 'cocoapods', '>= 1.8.3'
+gem 'github_changelog_generator'
+gem 'rake'
+gem 'xcpretty'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8cc5c06c8f..179126377c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,79 +1,114 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.4)
-    activesupport (4.2.7.1)
+    CFPropertyList (3.0.1)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (1.0.1)
-    cocoapods (1.1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.0.3)
+    cocoapods (1.8.3)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.8.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.1.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.3)
+      activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.2)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
-    colored (1.2)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    faraday (0.17.0)
+      multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
-    i18n (0.7.0)
-    json (1.8.5)
-    minitest (5.10.1)
-    molinillo (0.5.5)
-    nanaimo (0.2.3)
+    gh_inspector (1.1.3)
+    github_changelog_generator (1.14.3)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.1)
+      rake (>= 10.0)
+      retriable (~> 2.1)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    minitest (5.12.2)
+    molinillo (0.6.6)
+    multi_json (1.13.1)
+    multipart-post (2.1.1)
+    nanaimo (0.2.6)
     nap (1.1.0)
-    netrc (0.7.8)
-    rake (12.0.0)
-    rouge (1.11.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    netrc (0.11.0)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    public_suffix (3.1.1)
+    rainbow (3.0.0)
+    rake (13.0.0)
+    retriable (2.1.0)
+    rouge (2.0.7)
+    ruby-macho (1.4.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.4.2)
-      CFPropertyList (~> 2.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
-      nanaimo (~> 0.2.3)
-    xcpretty (0.2.4)
-      rouge (~> 1.8)
+    xcodeproj (1.12.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (>= 1.8.3)
+  github_changelog_generator
   rake
   xcpretty
 
 BUNDLED WITH
-   1.13.7
+   1.16.6
diff --git a/LICENSE b/LICENSE
index e06d208186..8198c7a0cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2016-2019 Daniel Cohen Gindi & Philipp Jahoda
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/Package.swift b/Package.swift
new file mode 100644
index 0000000000..f2b367a73e
--- /dev/null
+++ b/Package.swift
@@ -0,0 +1,21 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "Charts",
+    platforms: [
+          .iOS(.v8),
+          .tvOS(.v9),
+          .macOS(.v10_11),
+    ],
+    products: [
+        .library(
+            name: "Charts",
+            targets: ["Charts"]),
+    ],
+    targets: [
+        .target(name: "Charts")
+    ],
+    swiftLanguageVersions: [.v5]
+)
diff --git a/README.md b/README.md
index 6043cd4e6f..e41fec87fa 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-**Version 3.0.2**, synced to [MPAndroidChart #f6a398b](https://github.com/PhilJay/MPAndroidChart/commit/f6a398b)
+**Version 3.4.0**, synced to [MPAndroidChart #f6a398b](https://github.com/PhilJay/MPAndroidChart/commit/f6a398b)
 
 ![alt tag](https://raw.github.com/danielgindi/Charts/master/Assets/feature_graphic.png)
   ![Supported Platforms](https://img.shields.io/cocoapods/p/Charts.svg) [![Releases](https://img.shields.io/github/release/danielgindi/Charts.svg)](https://github.com/danielgindi/Charts/releases) [![Latest pod release](https://img.shields.io/cocoapods/v/Charts.svg)](http://cocoapods.org/pods/charts) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Build Status](https://travis-ci.org/danielgindi/Charts.svg?branch=master)](https://travis-ci.org/danielgindi/Charts) [![codecov](https://codecov.io/gh/danielgindi/Charts/branch/master/graph/badge.svg)](https://codecov.io/gh/danielgindi/Charts)
@@ -6,13 +6,14 @@
 
 ### Just a heads up: Charts 3.0 has some breaking changes. Please read [the release/migration notes](https://github.com/danielgindi/Charts/releases/tag/v3.0.0). 
 ### Another heads up: ChartsRealm is now in a [separate repo](https://github.com/danielgindi/ChartsRealm). Pods is also now `Charts` and `ChartsRealm`, instead of ~`Charts/Core`~ and ~`Charts/Realm`~
+### One more heads up: As Swift evolves, if you are not using the latest Swift compiler, you shouldn't check out the master branch. Instead, you should go to the release page and pick up whatever suits you.
 
-* Xcode 8.0 / Swift 3.1
+* Xcode 11 / Swift 5 (master branch)
 * iOS >= 8.0 (Use as an **Embedded** Framework)
 * tvOS >= 9.0
 * macOS >= 10.11
 
-Okay so there's this beautiful library called [MPAndroidChart](https://github.com/PhilJay/MPAndroidChart) by [Philipp Jahoda](https://www.linkedin.com/in/philippjahoda) which has become very popular amongst Android developers, and in the meanwhile there's no decent charting solution for iOS.
+Okay so there's this beautiful library called [MPAndroidChart](https://github.com/PhilJay/MPAndroidChart) by [Philipp Jahoda](https://www.linkedin.com/in/philippjahoda) which has become very popular amongst Android developers, but there was no decent solution to create charts for iOS.
 
 I've chosen to write it in `Swift` as it can be highly optimized by the compiler, and can be used in both `Swift` and `ObjC` project. The demo project is written in `ObjC` to demonstrate how it works.
 
@@ -25,7 +26,7 @@ I've chosen to write it in `Swift` as it can be highly optimized by the compiler
 * Make sure you are running a supported version of Xcode.
   * Usually it is specified here a few lines above.
   * In most cases it will be the latest Xcode version.
-* Make sure that your project supports Swift 3.0
+* Make sure that your project supports Swift 5.0
 * Optional: Run `carthage checkout` in the project folder, to fetch dependencies (i.e testing dependencies).
   * If you don't have Carthage - you can get it [here](https://github.com/Carthage/Carthage/releases).
 
@@ -48,6 +49,9 @@ In order to correctly compile:
 ## 3rd party tutorials
 
 * [Using Realm and Charts with Swift 3 in iOS 10 (Sami Korpela)](https://medium.com/@skoli/using-realm-and-charts-with-swift-3-in-ios-10-40c42e3838c0#.2gyymwfh8)
+* [Creating a Line Chart in Swift 3 and iOS 10 (Osian Smith)](https://medium.com/@OsianSmith/creating-a-line-chart-in-swift-3-and-ios-10-2f647c95392e)
+* [Beginning Set-up and Example Using Charts with Swift 3](https://github.com/annalizhaz/ChartsForSwiftBasic)
+* [Creating a Radar Chart in Swift (David Piper)](https://medium.com/@HeyDaveTheDev/creating-a-radar-chart-in-swift-5791afcf92f0)
 * Want your tutorial to show here? Create a PR!
 
 ## Troubleshooting
@@ -76,8 +80,8 @@ For [Realm](https://realm.io/) support, please add `pod 'ChartsRealm'` too.
 Charts now include Carthage prebuilt binaries.
 
 ```carthage
-github "danielgindi/Charts" == 3.0.2
-github "danielgindi/Charts" ~> 3.0.2
+github "danielgindi/Charts" == 3.4.0
+github "danielgindi/Charts" ~> 3.4.0
 ```
 
 In order to build the binaries for a new release, use `carthage build --no-skip-current && carthage archive Charts`.
@@ -185,7 +189,7 @@ Documentation
 Currently there's no need for documentation for the iOS/tvOS/macOS version, as the API is **95% the same** as on Android.  
 You can read the official [MPAndroidChart](https://github.com/PhilJay/MPAndroidChart) documentation here: [**Wiki**](https://github.com/PhilJay/MPAndroidChart/wiki)
 
-Or you can see the [**ChartsDemo**](https://github.com/danielgindi/Charts/tree/master/ChartsDemo) project and learn the how-tos from it.
+Or you can see the Charts Demo project in both Objective-C and Swift ([**ChartsDemo-iOS**](https://github.com/danielgindi/Charts/tree/master/ChartsDemo-iOS), as well as macOS [**ChartsDemo-macOS**](https://github.com/danielgindi/Charts/tree/master/ChartsDemo-macOS)) and learn the how-tos from it.
 
 
 Special Thanks
@@ -193,6 +197,13 @@ Special Thanks
 
 Goes to [@liuxuan30](https://github.com/liuxuan30), [@petester42](https://github.com/petester42) and  [@AlBirdie](https://github.com/AlBirdie) for new features, bugfixes, and lots and lots of involvement in our open-sourced community! You guys are a huge help to all of those coming here with questions and issues, and I couldn't respond to all of those without you.
 
+### Our amazing sponsors
+
+[Debricked](https://debricked.com/): Use open source securely
+
+[![debricked](https://user-images.githubusercontent.com/4375169/73585544-25bfa800-44dd-11ea-9661-82519a125302.jpg)](https://debricked.com/)
+
+
 License
 =======
 Copyright 2016 Daniel Cohen Gindi & Philipp Jahoda
diff --git a/Rakefile b/Rakefile
index eddda52865..c951ce57c2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,11 @@ def type
 end
 
 def project_name
-  'Charts.xcodeproj'
+  'ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj'
+end
+
+def macos_project_name
+  'ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj'
 end
 
 def configuration
@@ -11,9 +15,9 @@ def configuration
 end
 
 def test_platforms
-  [
-    :iOS,
-    :tvOS
+  %i[
+    iOS
+    tvOS
   ]
 end
 
@@ -24,9 +28,22 @@ def build_platforms
 end
 
 def build_schemes
-  %w(
+  %w[
     Charts
-  )
+  ]
+end
+
+def build_demo_schemes
+  %i[
+    ChartsDemo-iOS
+    ChartsDemo-iOS-Swift
+  ]
+end
+
+def build_macos_demo_schemes
+  [
+    'ChartsDemo-macOS'
+  ]
 end
 
 def test_schemes
@@ -39,8 +56,8 @@ def devices
   {
     iOS: {
       sdk: 'iphonesimulator',
-      device: "name='iPhone 7'",
-      name: 'iPhone 7'
+      device: "name='iPhone 8'",
+      name: 'iPhone 8'
     },
     macOS: {
       sdk: 'macosx',
@@ -49,8 +66,8 @@ def devices
     },
     tvOS: {
       sdk: 'appletvsimulator',
-      device: "name='Apple TV 1080p'",
-      name: 'Apple TV 1080p'
+      device: "name='Apple TV'",
+      name: 'Apple TV'
     }
   }
 end
@@ -74,35 +91,43 @@ def xcodebuild(type, name, scheme, configuration, sdk, destination, tasks, xcpre
   sh "set -o pipefail && xcodebuild #{project_type} '#{name}' -scheme '#{scheme}' -configuration '#{configuration}' -sdk #{sdk} -destination #{destination} #{tasks} | bundle exec xcpretty -c #{xcprety_args}"
 end
 
-def run_xcodebuild(schemes_to_execute, tasks, destination, is_test, xcprety_args)
+def run_xcodebuild(tasks, destination, is_build_demo, xcprety_args)
   sdk = destination[:sdk]
   device = destination[:device]
   uuid = destination[:uuid]
 
+  is_test = tasks.include?('test')
+  is_macos = sdk == 'macosx'
+
+  project = is_macos ? macos_project_name : project_name
+
+  schemes_to_execute = []
+  if is_test
+    schemes_to_execute = test_schemes
+  elsif is_build_demo
+    schemes_to_execute = is_macos ? build_macos_demo_schemes : build_demo_schemes
+  else
+    schemes_to_execute = build_schemes
+  end
+
   open_simulator_and_sleep uuid if is_test
 
   schemes_to_execute.each do |scheme|
-    xcodebuild type, project_name, scheme, configuration, sdk, device, tasks, xcprety_args
+    xcodebuild type, project, scheme, configuration, sdk, device, tasks, xcprety_args
   end
-
-  sh 'killall Simulator' if is_test
 end
 
-def execute(tasks, platform, xcprety_args: '')
-  is_test = tasks.include?('test')
-
+def execute(tasks, platform, is_build_demo = false, xcprety_args: '')
   # platform specific settings
   destination = devices[platform]
 
-  schemes = is_test ? test_schemes : build_schemes
-
   # check if xcodebuild needs to be run on multiple devices
   if destination.is_a?(Array)
     destination.each do |destination|
-      run_xcodebuild schemes, tasks, destination, is_test, xcprety_args
+      run_xcodebuild tasks, destination, is_build_demo, xcprety_args
     end
   else
-    run_xcodebuild schemes, tasks, destination, is_test, xcprety_args
+    run_xcodebuild tasks, destination, is_build_demo, xcprety_args
   end
 end
 
@@ -123,12 +148,19 @@ end
 
 desc 'Run CI tasks. Build and test or build depending on the platform.'
 task :ci, [:platform] do |_task, args|
-  platform = arg_to_key(args[:platform]) if args.has_key?(:platform)
-
-  if test_platforms.include?(platform)
-    execute 'clean test', platform
-  elsif build_platforms.include?(platform)
-    execute 'clean build', platform
+  platform = arg_to_key(args[:platform]) if args.key?(:platform)
+  is_build_demo = test_platforms.include?(platform) || build_platforms.include?(platform)
+
+  if test_platforms.include?(platform)  # iOS and tvOS
+    if platform == :iOS
+      execute 'clean', platform, is_build_demo
+      execute 'build', platform, is_build_demo
+      execute 'test', platform  # not use demo specifically
+    else
+      execute 'clean test', platform
+    end
+  elsif build_platforms.include?(platform)  # macOS
+    execute 'clean build', platform, is_build_demo
   else
     test_platforms.each do |platform|
       execute 'clean test', platform
@@ -140,6 +172,11 @@ task :ci, [:platform] do |_task, args|
 end
 
 desc 'updated the podspec on cocoapods'
-task :update_pod do 
-  sh "bundle exec pod trunk push Charts.podspec --allow-warnings"
+task :update_pod do
+  sh 'bundle exec pod trunk push Charts.podspec --allow-warnings'
+end
+
+desc 'generate changelog'
+task :generate_changelog do
+  sh 'github_changelog_generator'
 end
diff --git a/Source/Charts/Animation/Animator.swift b/Source/Charts/Animation/Animator.swift
index 15ef569a17..7d0afa1222 100644
--- a/Source/Charts/Animation/Animator.swift
+++ b/Source/Charts/Animation/Animator.swift
@@ -11,10 +11,7 @@
 
 import Foundation
 import CoreGraphics
-
-#if !os(OSX)
-    import UIKit
-#endif
+import QuartzCore
 
 @objc(ChartAnimatorDelegate)
 public protocol AnimatorDelegate
@@ -29,33 +26,33 @@ public protocol AnimatorDelegate
 @objc(ChartAnimator)
 open class Animator: NSObject
 {
-    open weak var delegate: AnimatorDelegate?
-    open var updateBlock: (() -> Void)?
-    open var stopBlock: (() -> Void)?
+    @objc open weak var delegate: AnimatorDelegate?
+    @objc open var updateBlock: (() -> Void)?
+    @objc open var stopBlock: (() -> Void)?
     
     /// the phase that is animated and influences the drawn values on the x-axis
-    open var phaseX: Double = 1.0
+    @objc open var phaseX: Double = 1.0
     
     /// the phase that is animated and influences the drawn values on the y-axis
-    open var phaseY: Double = 1.0
-    
-    fileprivate var _startTimeX: TimeInterval = 0.0
-    fileprivate var _startTimeY: TimeInterval = 0.0
-    fileprivate var _displayLink: NSUIDisplayLink?
+    @objc open var phaseY: Double = 1.0
     
-    fileprivate var _durationX: TimeInterval = 0.0
-    fileprivate var _durationY: TimeInterval = 0.0
+    private var _startTimeX: TimeInterval = 0.0
+    private var _startTimeY: TimeInterval = 0.0
+    private var _displayLink: NSUIDisplayLink?
     
-    fileprivate var _endTimeX: TimeInterval = 0.0
-    fileprivate var _endTimeY: TimeInterval = 0.0
-    fileprivate var _endTime: TimeInterval = 0.0
+    private var _durationX: TimeInterval = 0.0
+    private var _durationY: TimeInterval = 0.0
     
-    fileprivate var _enabledX: Bool = false
-    fileprivate var _enabledY: Bool = false
+    private var _endTimeX: TimeInterval = 0.0
+    private var _endTimeY: TimeInterval = 0.0
+    private var _endTime: TimeInterval = 0.0
     
-    fileprivate var _easingX: ChartEasingFunctionBlock?
-    fileprivate var _easingY: ChartEasingFunctionBlock?
+    private var _enabledX: Bool = false
+    private var _enabledY: Bool = false
     
+    private var _easingX: ChartEasingFunctionBlock?
+    private var _easingY: ChartEasingFunctionBlock?
+
     public override init()
     {
         super.init()
@@ -66,44 +63,31 @@ open class Animator: NSObject
         stop()
     }
     
-    open func stop()
+    @objc open func stop()
     {
-        if _displayLink != nil
+        guard _displayLink != nil else { return }
+
+        _displayLink?.remove(from: .main, forMode: RunLoop.Mode.common)
+        _displayLink = nil
+
+        _enabledX = false
+        _enabledY = false
+
+        // If we stopped an animation in the middle, we do not want to leave it like this
+        if phaseX != 1.0 || phaseY != 1.0
         {
-            _displayLink?.remove(from: RunLoop.main, forMode: RunLoopMode.commonModes)
-            _displayLink = nil
-            
-            _enabledX = false
-            _enabledY = false
-            
-            // If we stopped an animation in the middle, we do not want to leave it like this
-            if phaseX != 1.0 || phaseY != 1.0
-            {
-                phaseX = 1.0
-                phaseY = 1.0
-                
-                if delegate != nil
-                {
-                    delegate!.animatorUpdated(self)
-                }
-                if updateBlock != nil
-                {
-                    updateBlock!()
-                }
-            }
-            
-            if delegate != nil
-            {
-                delegate!.animatorStopped(self)
-            }
-            if stopBlock != nil
-            {
-                stopBlock?()
-            }
+            phaseX = 1.0
+            phaseY = 1.0
+
+            delegate?.animatorUpdated(self)
+            updateBlock?()
         }
+
+        delegate?.animatorStopped(self)
+        stopBlock?()
     }
     
-    fileprivate func updateAnimationPhases(_ currentTime: TimeInterval)
+    private func updateAnimationPhases(_ currentTime: TimeInterval)
     {
         if _enabledX
         {
@@ -115,14 +99,7 @@ open class Animator: NSObject
                 elapsed = duration
             }
            
-            if _easingX != nil
-            {
-                phaseX = _easingX!(elapsed, duration)
-            }
-            else
-            {
-                phaseX = Double(elapsed / duration)
-            }
+            phaseX = _easingX?(elapsed, duration) ?? elapsed / duration
         }
         
         if _enabledY
@@ -134,32 +111,19 @@ open class Animator: NSObject
             {
                 elapsed = duration
             }
-            
-            if _easingY != nil
-            {
-                phaseY = _easingY!(elapsed, duration)
-            }
-            else
-            {
-                phaseY = Double(elapsed / duration)
-            }
+
+            phaseY = _easingY?(elapsed, duration) ?? elapsed / duration
         }
     }
     
-    @objc fileprivate func animationLoop()
+    @objc private func animationLoop()
     {
         let currentTime: TimeInterval = CACurrentMediaTime()
         
         updateAnimationPhases(currentTime)
-        
-        if delegate != nil
-        {
-            delegate!.animatorUpdated(self)
-        }
-        if updateBlock != nil
-        {
-            updateBlock!()
-        }
+
+        delegate?.animatorUpdated(self)
+        updateBlock?()
         
         if currentTime >= _endTime
         {
@@ -169,11 +133,13 @@ open class Animator: NSObject
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingX: an easing function for the animation on the x axis
-    /// - parameter easingY: an easing function for the animation on the y axis
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingX: ChartEasingFunctionBlock?, easingY: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingX: an easing function for the animation on the x axis
+    ///   - easingY: an easing function for the animation on the y axis
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingX: ChartEasingFunctionBlock?, easingY: ChartEasingFunctionBlock?)
     {
         stop()
         
@@ -196,55 +162,54 @@ open class Animator: NSObject
         if _enabledX || _enabledY
         {
             _displayLink = NSUIDisplayLink(target: self, selector: #selector(animationLoop))
-            _displayLink?.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
+            _displayLink?.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
         }
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingOptionX: the easing function for the animation on the x axis
-    /// - parameter easingOptionY: the easing function for the animation on the y axis
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOptionX: ChartEasingOption, easingOptionY: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingOptionX: the easing function for the animation on the x axis
+    ///   - easingOptionY: the easing function for the animation on the y axis
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOptionX: ChartEasingOption, easingOptionY: ChartEasingOption)
     {
         animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easingX: easingFunctionFromOption(easingOptionX), easingY: easingFunctionFromOption(easingOptionY))
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easing: an easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easing: an easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
     {
         animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easingX: easing, easingY: easing)
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingOption: the easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOption: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingOption: the easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOption: ChartEasingOption = .easeInOutSine)
     {
         animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easing: easingFunctionFromOption(easingOption))
     }
-    
-    /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
-    /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval)
-    {
-        animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easingOption: .easeInOutSine)
-    }
-    
+
     /// Animates the drawing / rendering of the chart the x-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter easing: an easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - easing: an easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
     {
         _startTimeX = CACurrentMediaTime()
         _durationX = xAxisDuration
@@ -257,38 +222,32 @@ open class Animator: NSObject
         // Take care of the first frame if rendering is already scheduled...
         updateAnimationPhases(_startTimeX)
         
-        if _enabledX || _enabledY
+        if _enabledX || _enabledY,
+            _displayLink == nil
         {
-            if _displayLink == nil
-            {
-                _displayLink = NSUIDisplayLink(target: self, selector: #selector(animationLoop))
-                _displayLink?.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
-            }
+            _displayLink = NSUIDisplayLink(target: self, selector: #selector(animationLoop))
+            _displayLink?.add(to: .main, forMode: RunLoop.Mode.common)
         }
     }
     
     /// Animates the drawing / rendering of the chart the x-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter easingOption: the easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, easingOption: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - easingOption: the easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, easingOption: ChartEasingOption = .easeInOutSine)
     {
         animate(xAxisDuration: xAxisDuration, easing: easingFunctionFromOption(easingOption))
     }
-    
-    /// Animates the drawing / rendering of the chart the x-axis with the specified animation time.
-    /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    open func animate(xAxisDuration: TimeInterval)
-    {
-        animate(xAxisDuration: xAxisDuration, easingOption: .easeInOutSine)
-    }
-    
+
     /// Animates the drawing / rendering of the chart the y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easing: an easing function for the animation
-    open func animate(yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easing: an easing function for the animation
+    @objc open func animate(yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
     {
         _startTimeY = CACurrentMediaTime()
         _durationY = yAxisDuration
@@ -301,30 +260,22 @@ open class Animator: NSObject
         // Take care of the first frame if rendering is already scheduled...
         updateAnimationPhases(_startTimeY)
         
-        if _enabledX || _enabledY
+        if _enabledX || _enabledY,
+            _displayLink == nil
         {
-            if _displayLink == nil
-            {
-                _displayLink = NSUIDisplayLink(target: self, selector: #selector(animationLoop))
-                _displayLink?.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
-            }
+            _displayLink = NSUIDisplayLink(target: self, selector: #selector(animationLoop))
+            _displayLink?.add(to: .main, forMode: RunLoop.Mode.common)
         }
     }
     
     /// Animates the drawing / rendering of the chart the y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingOption: the easing function for the animation
-    open func animate(yAxisDuration: TimeInterval, easingOption: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingOption: the easing function for the animation
+    @objc open func animate(yAxisDuration: TimeInterval, easingOption: ChartEasingOption = .easeInOutSine)
     {
         animate(yAxisDuration: yAxisDuration, easing: easingFunctionFromOption(easingOption))
     }
-    
-    /// Animates the drawing / rendering of the chart the y-axis with the specified animation time.
-    /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter yAxisDuration: duration for animating the y axis
-    open func animate(yAxisDuration: TimeInterval)
-    {
-        animate(yAxisDuration: yAxisDuration, easingOption: .easeInOutSine)
-    }
 }
diff --git a/Source/Charts/Charts/BarChartView.swift b/Source/Charts/Charts/BarChartView.swift
index a9e060b48b..4f9aaa0bc9 100644
--- a/Source/Charts/Charts/BarChartView.swift
+++ b/Source/Charts/Charts/BarChartView.swift
@@ -16,10 +16,10 @@ import CoreGraphics
 open class BarChartView: BarLineChartViewBase, BarChartDataProvider
 {
     /// if set to true, all values are drawn above their bars, instead of below their top
-    fileprivate var _drawValueAboveBarEnabled = true
+    private var _drawValueAboveBarEnabled = true
 
     /// if set to true, a grey area is drawn behind each bar that indicates the maximum value
-    fileprivate var _drawBarShadowEnabled = false
+    private var _drawBarShadowEnabled = false
     
     internal override func initialize()
     {
@@ -50,15 +50,15 @@ open class BarChartView: BarLineChartViewBase, BarChartDataProvider
         }
         
         // calculate axis range (min / max) according to provided data
-        _leftAxis.calculate(
+        leftAxis.calculate(
             min: data.getYMin(axis: .left),
             max: data.getYMax(axis: .left))
-        _rightAxis.calculate(
+        rightAxis.calculate(
             min: data.getYMin(axis: .right),
             max: data.getYMax(axis: .right))
     }
     
-    /// - returns: The Highlight object (contains x-index and DataSet index) of the selected value at the given touch point inside the BarChart.
+    /// - Returns: The Highlight object (contains x-index and DataSet index) of the selected value at the given touch point inside the BarChart.
     open override func getHighlightByTouchPoint(_ pt: CGPoint) -> Highlight?
     {
         if _data === nil
@@ -82,8 +82,8 @@ open class BarChartView: BarLineChartViewBase, BarChartDataProvider
             axis: h.axis)
     }
         
-    /// - returns: The bounding box of the specified Entry in the specified DataSet. Returns null if the Entry could not be found in the charts data.
-    open func getBarBounds(entry e: BarChartDataEntry) -> CGRect
+    /// - Returns: The bounding box of the specified Entry in the specified DataSet. Returns null if the Entry could not be found in the charts data.
+    @objc open func getBarBounds(entry e: BarChartDataEntry) -> CGRect
     {
         guard let
             data = _data as? BarChartData,
@@ -111,10 +111,11 @@ open class BarChartView: BarLineChartViewBase, BarChartDataProvider
     /// Previously set x-values of entries will be overwritten. Leaves space between bars and groups as specified by the parameters.
     /// Calls `notifyDataSetChanged()` afterwards.
     ///
-    /// - parameter fromX: the starting point on the x-axis where the grouping should begin
-    /// - parameter groupSpace: the space between groups of bars in values (not pixels) e.g. 0.8f for bar width 1f
-    /// - parameter barSpace: the space between individual bars in values (not pixels) e.g. 0.1f for bar width 1f
-    open func groupBars(fromX: Double, groupSpace: Double, barSpace: Double)
+    /// - Parameters:
+    ///   - fromX: the starting point on the x-axis where the grouping should begin
+    ///   - groupSpace: the space between groups of bars in values (not pixels) e.g. 0.8f for bar width 1f
+    ///   - barSpace: the space between individual bars in values (not pixels) e.g. 0.1f for bar width 1f
+    @objc open func groupBars(fromX: Double, groupSpace: Double, barSpace: Double)
     {
         guard let barData = self.barData
             else
@@ -128,10 +129,12 @@ open class BarChartView: BarLineChartViewBase, BarChartDataProvider
     }
     
     /// Highlights the value at the given x-value in the given DataSet. Provide -1 as the dataSetIndex to undo all highlighting.
-    /// - parameter x:
-    /// - parameter dataSetIndex:
-    /// - parameter stackIndex: the index inside the stack - only relevant for stacked entries
-    open func highlightValue(x: Double, dataSetIndex: Int, stackIndex: Int)
+    ///
+    /// - Parameters:
+    ///   - x:
+    ///   - dataSetIndex:
+    ///   - stackIndex: the index inside the stack - only relevant for stacked entries
+    @objc open func highlightValue(x: Double, dataSetIndex: Int, stackIndex: Int)
     {
         highlightValue(Highlight(x: x, dataSetIndex: dataSetIndex, stackIndex: stackIndex))
     }
@@ -139,7 +142,7 @@ open class BarChartView: BarLineChartViewBase, BarChartDataProvider
     // MARK: Accessors
     
     /// if set to true, all values are drawn above their bars, instead of below their top
-    open var drawValueAboveBarEnabled: Bool
+    @objc open var drawValueAboveBarEnabled: Bool
     {
         get { return _drawValueAboveBarEnabled }
         set
@@ -150,7 +153,7 @@ open class BarChartView: BarLineChartViewBase, BarChartDataProvider
     }
     
     /// if set to true, a grey area is drawn behind each bar that indicates the maximum value
-    open var drawBarShadowEnabled: Bool
+    @objc open var drawBarShadowEnabled: Bool
     {
         get { return _drawBarShadowEnabled }
         set
@@ -162,22 +165,22 @@ open class BarChartView: BarLineChartViewBase, BarChartDataProvider
     
     /// Adds half of the bar width to each side of the x-axis range in order to allow the bars of the barchart to be fully displayed.
     /// **default**: false
-    open var fitBars = false
+    @objc open var fitBars = false
     
     /// Set this to `true` to make the highlight operation full-bar oriented, `false` to make it highlight single values (relevant only for stacked).
     /// If enabled, highlighting operations will highlight the whole bar, even if only a single stack entry was tapped.
-    open var highlightFullBarEnabled: Bool = false
+    @objc open var highlightFullBarEnabled: Bool = false
     
-    /// - returns: `true` the highlight is be full-bar oriented, `false` ifsingle-value
+    /// `true` the highlight is be full-bar oriented, `false` ifsingle-value
     open var isHighlightFullBarEnabled: Bool { return highlightFullBarEnabled }
     
-    // MARK: - BarChartDataProbider
+    // MARK: - BarChartDataProvider
     
     open var barData: BarChartData? { return _data as? BarChartData }
     
-    /// - returns: `true` if drawing values above bars is enabled, `false` ifnot
+    /// `true` if drawing values above bars is enabled, `false` ifnot
     open var isDrawValueAboveBarEnabled: Bool { return drawValueAboveBarEnabled }
     
-    /// - returns: `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot
+    /// `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot
     open var isDrawBarShadowEnabled: Bool { return drawBarShadowEnabled }
 }
diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift
index 747120718f..1f8fdf81d5 100644
--- a/Source/Charts/Charts/BarLineChartViewBase.swift
+++ b/Source/Charts/Charts/BarLineChartViewBase.swift
@@ -12,10 +12,14 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 /// Base-class of LineChart, BarChart, ScatterChart and CandleStickChart.
 open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartDataProvider, NSUIGestureRecognizerDelegate
 {
@@ -24,51 +28,66 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     internal var _maxVisibleCount = 100
     
     /// flag that indicates if auto scaling on the y axis is enabled
-    fileprivate var _autoScaleMinMaxEnabled = false
+    private var _autoScaleMinMaxEnabled = false
     
-    fileprivate var _pinchZoomEnabled = false
-    fileprivate var _doubleTapToZoomEnabled = true
-    fileprivate var _dragEnabled = true
+    private var _pinchZoomEnabled = false
+    private var _doubleTapToZoomEnabled = true
+    private var _dragXEnabled = true
+    private var _dragYEnabled = true
     
-    fileprivate var _scaleXEnabled = true
-    fileprivate var _scaleYEnabled = true
+    private var _scaleXEnabled = true
+    private var _scaleYEnabled = true
     
     /// the color for the background of the chart-drawing area (everything behind the grid lines).
-    open var gridBackgroundColor = NSUIColor(red: 240/255.0, green: 240/255.0, blue: 240/255.0, alpha: 1.0)
+    @objc open var gridBackgroundColor = NSUIColor(red: 240/255.0, green: 240/255.0, blue: 240/255.0, alpha: 1.0)
     
-    open var borderColor = NSUIColor.black
-    open var borderLineWidth: CGFloat = 1.0
+    @objc open var borderColor = NSUIColor.black
+    @objc open var borderLineWidth: CGFloat = 1.0
     
     /// flag indicating if the grid background should be drawn or not
-    open var drawGridBackgroundEnabled = false
+    @objc open var drawGridBackgroundEnabled = false
     
     /// When enabled, the borders rectangle will be rendered.
     /// If this is enabled, there is no point drawing the axis-lines of x- and y-axis.
-    open var drawBordersEnabled = false
+    @objc open var drawBordersEnabled = false
     
     /// When enabled, the values will be clipped to contentRect, otherwise they can bleed outside the content rect.
-    open var clipValuesToContentEnabled: Bool = false
+    @objc open var clipValuesToContentEnabled: Bool = false
+
+    /// When disabled, the data and/or highlights will not be clipped to contentRect. Disabling this option can
+    /// be useful, when the data lies fully within the content rect, but is drawn in such a way (such as thick lines)
+    /// that there is unwanted clipping.
+    @objc open var clipDataToContentEnabled: Bool = true
 
     /// Sets the minimum offset (padding) around the chart, defaults to 10
-    open var minOffset = CGFloat(10.0)
+    @objc open var minOffset = CGFloat(10.0)
     
     /// Sets whether the chart should keep its position (zoom / scroll) after a rotation (orientation change)
     /// **default**: false
-    open var keepPositionOnRotation: Bool = false
+    @objc open var keepPositionOnRotation: Bool = false
     
-    /// the object representing the left y-axis
-    internal var _leftAxis: YAxis!
+    /// The left y-axis object. In the horizontal bar-chart, this is the
+    /// top axis.
+    @objc open internal(set) var leftAxis = YAxis(position: .left)
     
-    /// the object representing the right y-axis
-    internal var _rightAxis: YAxis!
+    /// The right y-axis object. In the horizontal bar-chart, this is the
+    /// bottom axis.
+    @objc open internal(set) var rightAxis = YAxis(position: .right)
+
+    /// The left Y axis renderer. This is a read-write property so you can set your own custom renderer here.
+    /// **default**: An instance of YAxisRenderer
+    @objc open lazy var leftYAxisRenderer = YAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: leftAxis, transformer: _leftAxisTransformer)
 
-    internal var _leftYAxisRenderer: YAxisRenderer!
-    internal var _rightYAxisRenderer: YAxisRenderer!
+    /// The right Y axis renderer. This is a read-write property so you can set your own custom renderer here.
+    /// **default**: An instance of YAxisRenderer
+    @objc open lazy var rightYAxisRenderer = YAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: rightAxis, transformer: _rightAxisTransformer)
     
     internal var _leftAxisTransformer: Transformer!
     internal var _rightAxisTransformer: Transformer!
     
-    internal var _xAxisRenderer: XAxisRenderer!
+    /// The X axis renderer. This is a read-write property so you can set your own custom renderer here.
+    /// **default**: An instance of XAxisRenderer
+    @objc open lazy var xAxisRenderer = XAxisRenderer(viewPortHandler: _viewPortHandler, xAxis: _xAxis, transformer: _leftAxisTransformer)
     
     internal var _tapGestureRecognizer: NSUITapGestureRecognizer!
     internal var _doubleTapGestureRecognizer: NSUITapGestureRecognizer!
@@ -78,7 +97,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     internal var _panGestureRecognizer: NSUIPanGestureRecognizer!
     
     /// flag that indicates if a custom viewport offset has been set
-    fileprivate var _customViewPortEnabled = false
+    private var _customViewPortEnabled = false
     
     public override init(frame: CGRect)
     {
@@ -98,18 +117,10 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     internal override func initialize()
     {
         super.initialize()
-        
-        _leftAxis = YAxis(position: .left)
-        _rightAxis = YAxis(position: .right)
-        
+
         _leftAxisTransformer = Transformer(viewPortHandler: _viewPortHandler)
         _rightAxisTransformer = Transformer(viewPortHandler: _viewPortHandler)
         
-        _leftYAxisRenderer = YAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: _leftAxis, transformer: _leftAxisTransformer)
-        _rightYAxisRenderer = YAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: _rightAxis, transformer: _rightAxisTransformer)
-        
-        _xAxisRenderer = XAxisRenderer(viewPortHandler: _viewPortHandler, xAxis: _xAxis, transformer: _leftAxisTransformer)
-        
         self.highlighter = ChartHighlighter(chart: self)
         
         _tapGestureRecognizer = NSUITapGestureRecognizer(target: self, action: #selector(tapGestureRecognized(_:)))
@@ -124,13 +135,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         self.addGestureRecognizer(_panGestureRecognizer)
         
         _doubleTapGestureRecognizer.isEnabled = _doubleTapToZoomEnabled
-        _panGestureRecognizer.isEnabled = _dragEnabled
+        _panGestureRecognizer.isEnabled = _dragXEnabled || _dragYEnabled
 
         #if !os(tvOS)
-            _pinchGestureRecognizer = NSUIPinchGestureRecognizer(target: self, action: #selector(BarLineChartViewBase.pinchGestureRecognized(_:)))
-            _pinchGestureRecognizer.delegate = self
-            self.addGestureRecognizer(_pinchGestureRecognizer)
-            _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
+        _pinchGestureRecognizer = NSUIPinchGestureRecognizer(target: self, action: #selector(BarLineChartViewBase.pinchGestureRecognized(_:)))
+        _pinchGestureRecognizer.delegate = self
+        self.addGestureRecognizer(_pinchGestureRecognizer)
+        _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
         #endif
     }
     
@@ -155,18 +166,15 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         }
         else
         {
-            let _ = viewPortHandler.refresh(newMatrix: viewPortHandler.touchMatrix, chart: self, invalidate: true)
+            viewPortHandler.refresh(newMatrix: viewPortHandler.touchMatrix, chart: self, invalidate: true)
         }
     }
     
     open override func draw(_ rect: CGRect)
     {
         super.draw(rect)
-        
-        if _data === nil
-        {
-            return
-        }
+
+        guard data != nil, let renderer = renderer else { return }
         
         let optionalContext = NSUIGraphicsGetCurrentContext()
         guard let context = optionalContext else { return }
@@ -180,91 +188,104 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
             autoScale()
         }
 
-        if _leftAxis.isEnabled
+        if leftAxis.isEnabled
         {
-            _leftYAxisRenderer?.computeAxis(min: _leftAxis._axisMinimum, max: _leftAxis._axisMaximum, inverted: _leftAxis.isInverted)
+            leftYAxisRenderer.computeAxis(min: leftAxis._axisMinimum, max: leftAxis._axisMaximum, inverted: leftAxis.isInverted)
         }
         
-        if _rightAxis.isEnabled
+        if rightAxis.isEnabled
         {
-            _rightYAxisRenderer?.computeAxis(min: _rightAxis._axisMinimum, max: _rightAxis._axisMaximum, inverted: _rightAxis.isInverted)
+            rightYAxisRenderer.computeAxis(min: rightAxis._axisMinimum, max: rightAxis._axisMaximum, inverted: rightAxis.isInverted)
         }
         
         if _xAxis.isEnabled
         {
-            _xAxisRenderer?.computeAxis(min: _xAxis._axisMinimum, max: _xAxis._axisMaximum, inverted: false)
+            xAxisRenderer.computeAxis(min: _xAxis._axisMinimum, max: _xAxis._axisMaximum, inverted: false)
         }
         
-        _xAxisRenderer?.renderAxisLine(context: context)
-        _leftYAxisRenderer?.renderAxisLine(context: context)
-        _rightYAxisRenderer?.renderAxisLine(context: context)
+        xAxisRenderer.renderAxisLine(context: context)
+        leftYAxisRenderer.renderAxisLine(context: context)
+        rightYAxisRenderer.renderAxisLine(context: context)
 
         // The renderers are responsible for clipping, to account for line-width center etc.
-        _xAxisRenderer?.renderGridLines(context: context)
-        _leftYAxisRenderer?.renderGridLines(context: context)
-        _rightYAxisRenderer?.renderGridLines(context: context)
+        if xAxis.drawGridLinesBehindDataEnabled
+        {
+            xAxisRenderer.renderGridLines(context: context)
+            leftYAxisRenderer.renderGridLines(context: context)
+            rightYAxisRenderer.renderGridLines(context: context)
+        }
         
         if _xAxis.isEnabled && _xAxis.isDrawLimitLinesBehindDataEnabled
         {
-            _xAxisRenderer?.renderLimitLines(context: context)
+            xAxisRenderer.renderLimitLines(context: context)
         }
         
-        if _leftAxis.isEnabled && _leftAxis.isDrawLimitLinesBehindDataEnabled
+        if leftAxis.isEnabled && leftAxis.isDrawLimitLinesBehindDataEnabled
         {
-            _leftYAxisRenderer?.renderLimitLines(context: context)
+            leftYAxisRenderer.renderLimitLines(context: context)
         }
         
-        if _rightAxis.isEnabled && _rightAxis.isDrawLimitLinesBehindDataEnabled
+        if rightAxis.isEnabled && rightAxis.isDrawLimitLinesBehindDataEnabled
         {
-            _rightYAxisRenderer?.renderLimitLines(context: context)
+            rightYAxisRenderer.renderLimitLines(context: context)
         }
         
-        // make sure the data cannot be drawn outside the content-rect
         context.saveGState()
-        context.clip(to: _viewPortHandler.contentRect)
-        renderer?.drawData(context: context)
+        // make sure the data cannot be drawn outside the content-rect
+        if clipDataToContentEnabled {
+            context.clip(to: _viewPortHandler.contentRect)
+        }
+        renderer.drawData(context: context)
+        
+        // The renderers are responsible for clipping, to account for line-width center etc.
+        if !xAxis.drawGridLinesBehindDataEnabled
+        {
+            xAxisRenderer.renderGridLines(context: context)
+            leftYAxisRenderer.renderGridLines(context: context)
+            rightYAxisRenderer.renderGridLines(context: context)
+        }
         
         // if highlighting is enabled
         if (valuesToHighlight())
         {
-            renderer?.drawHighlighted(context: context, indices: _indicesToHighlight)
+            renderer.drawHighlighted(context: context, indices: _indicesToHighlight)
         }
         
         context.restoreGState()
         
-        renderer!.drawExtras(context: context)
+        renderer.drawExtras(context: context)
         
         if _xAxis.isEnabled && !_xAxis.isDrawLimitLinesBehindDataEnabled
         {
-            _xAxisRenderer?.renderLimitLines(context: context)
+            xAxisRenderer.renderLimitLines(context: context)
         }
         
-        if _leftAxis.isEnabled && !_leftAxis.isDrawLimitLinesBehindDataEnabled
+        if leftAxis.isEnabled && !leftAxis.isDrawLimitLinesBehindDataEnabled
         {
-            _leftYAxisRenderer?.renderLimitLines(context: context)
+            leftYAxisRenderer.renderLimitLines(context: context)
         }
         
-        if _rightAxis.isEnabled && !_rightAxis.isDrawLimitLinesBehindDataEnabled
+        if rightAxis.isEnabled && !rightAxis.isDrawLimitLinesBehindDataEnabled
         {
-            _rightYAxisRenderer?.renderLimitLines(context: context)
+            rightYAxisRenderer.renderLimitLines(context: context)
         }
         
-        _xAxisRenderer.renderAxisLabels(context: context)
-        _leftYAxisRenderer.renderAxisLabels(context: context)
-        _rightYAxisRenderer.renderAxisLabels(context: context)
+        xAxisRenderer.renderAxisLabels(context: context)
+        leftYAxisRenderer.renderAxisLabels(context: context)
+        rightYAxisRenderer.renderAxisLabels(context: context)
 
         if clipValuesToContentEnabled
         {
             context.saveGState()
             context.clip(to: _viewPortHandler.contentRect)
             
-            renderer!.drawValues(context: context)
+            renderer.drawValues(context: context)
             
             context.restoreGState()
         }
         else
         {
-            renderer!.drawValues(context: context)
+            renderer.drawValues(context: context)
         }
 
         _legendRenderer.renderLegend(context: context)
@@ -274,8 +295,8 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         drawMarkers(context: context)
     }
     
-    fileprivate var _autoScaleLastLowestVisibleX: Double?
-    fileprivate var _autoScaleLastHighestVisibleX: Double?
+    private var _autoScaleLastLowestVisibleX: Double?
+    private var _autoScaleLastHighestVisibleX: Double?
     
     /// Performs auto scaling of the axis by recalculating the minimum and maximum y-values based on the entries currently in view.
     internal func autoScale()
@@ -289,14 +310,14 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         
         // calculate axis range (min / max) according to provided data
         
-        if _leftAxis.isEnabled
+        if leftAxis.isEnabled
         {
-            _leftAxis.calculate(min: data.getYMin(axis: .left), max: data.getYMax(axis: .left))
+            leftAxis.calculate(min: data.getYMin(axis: .left), max: data.getYMax(axis: .left))
         }
         
-        if _rightAxis.isEnabled
+        if rightAxis.isEnabled
         {
-            _rightAxis.calculate(min: data.getYMin(axis: .right), max: data.getYMax(axis: .right))
+            rightAxis.calculate(min: data.getYMin(axis: .right), max: data.getYMax(axis: .right))
         }
         
         calculateOffsets()
@@ -304,14 +325,14 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     internal func prepareValuePxMatrix()
     {
-        _rightAxisTransformer.prepareMatrixValuePx(chartXMin: _xAxis._axisMinimum, deltaX: CGFloat(xAxis.axisRange), deltaY: CGFloat(_rightAxis.axisRange), chartYMin: _rightAxis._axisMinimum)
-        _leftAxisTransformer.prepareMatrixValuePx(chartXMin: xAxis._axisMinimum, deltaX: CGFloat(xAxis.axisRange), deltaY: CGFloat(_leftAxis.axisRange), chartYMin: _leftAxis._axisMinimum)
+        _rightAxisTransformer.prepareMatrixValuePx(chartXMin: _xAxis._axisMinimum, deltaX: CGFloat(xAxis.axisRange), deltaY: CGFloat(rightAxis.axisRange), chartYMin: rightAxis._axisMinimum)
+        _leftAxisTransformer.prepareMatrixValuePx(chartXMin: xAxis._axisMinimum, deltaX: CGFloat(xAxis.axisRange), deltaY: CGFloat(leftAxis.axisRange), chartYMin: leftAxis._axisMinimum)
     }
     
     internal func prepareOffsetMatrix()
     {
-        _rightAxisTransformer.prepareMatrixOffset(inverted: _rightAxis.isInverted)
-        _leftAxisTransformer.prepareMatrixOffset(inverted: _leftAxis.isInverted)
+        _rightAxisTransformer.prepareMatrixOffset(inverted: rightAxis.isInverted)
+        _leftAxisTransformer.prepareMatrixOffset(inverted: leftAxis.isInverted)
     }
     
     open override func notifyDataSetChanged()
@@ -320,19 +341,19 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         
         calcMinMax()
         
-        _leftYAxisRenderer?.computeAxis(min: _leftAxis._axisMinimum, max: _leftAxis._axisMaximum, inverted: _leftAxis.isInverted)
-        _rightYAxisRenderer?.computeAxis(min: _rightAxis._axisMinimum, max: _rightAxis._axisMaximum, inverted: _rightAxis.isInverted)
+        leftYAxisRenderer.computeAxis(min: leftAxis._axisMinimum, max: leftAxis._axisMaximum, inverted: leftAxis.isInverted)
+        rightYAxisRenderer.computeAxis(min: rightAxis._axisMinimum, max: rightAxis._axisMaximum, inverted: rightAxis.isInverted)
         
         if let data = _data
         {
-            _xAxisRenderer?.computeAxis(
+            xAxisRenderer.computeAxis(
                 min: _xAxis._axisMinimum,
                 max: _xAxis._axisMaximum,
                 inverted: false)
 
             if _legend !== nil
             {
-                _legendRenderer?.computeLegend(data: data)
+                legendRenderer?.computeLegend(data: data)
             }
         }
         
@@ -347,8 +368,8 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         _xAxis.calculate(min: _data?.xMin ?? 0.0, max: _data?.xMax ?? 0.0)
         
         // calculate axis range (min / max) according to provided data
-        _leftAxis.calculate(min: _data?.getYMin(axis: .left) ?? 0.0, max: _data?.getYMax(axis: .left) ?? 0.0)
-        _rightAxis.calculate(min: _data?.getYMin(axis: .right) ?? 0.0, max: _data?.getYMax(axis: .right) ?? 0.0)
+        leftAxis.calculate(min: _data?.getYMin(axis: .left) ?? 0.0, max: _data?.getYMax(axis: .left) ?? 0.0)
+        rightAxis.calculate(min: _data?.getYMin(axis: .right) ?? 0.0, max: _data?.getYMax(axis: .right) ?? 0.0)
     }
     
     internal func calculateLegendOffsets(offsetLeft: inout CGFloat, offsetTop: inout CGFloat, offsetRight: inout CGFloat, offsetBottom: inout CGFloat)
@@ -389,17 +410,9 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                 {
                 case .top:
                     offsetTop += min(_legend.neededHeight, _viewPortHandler.chartHeight * _legend.maxSizePercent) + _legend.yOffset
-                    if xAxis.isEnabled && xAxis.isDrawLabelsEnabled
-                    {
-                        offsetTop += xAxis.labelRotatedHeight
-                    }
                     
                 case .bottom:
                     offsetBottom += min(_legend.neededHeight, _viewPortHandler.chartHeight * _legend.maxSizePercent) + _legend.yOffset
-                    if xAxis.isEnabled && xAxis.isDrawLabelsEnabled
-                    {
-                        offsetBottom += xAxis.labelRotatedHeight
-                    }
                     
                 default:
                     break
@@ -499,27 +512,27 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     // MARK: - Gestures
     
-    fileprivate enum GestureScaleAxis
+    private enum GestureScaleAxis
     {
         case both
         case x
         case y
     }
     
-    fileprivate var _isDragging = false
-    fileprivate var _isScaling = false
-    fileprivate var _gestureScaleAxis = GestureScaleAxis.both
-    fileprivate var _closestDataSetToTouch: IChartDataSet!
-    fileprivate var _panGestureReachedEdge: Bool = false
-    fileprivate weak var _outerScrollView: NSUIScrollView?
+    private var _isDragging = false
+    private var _isScaling = false
+    private var _gestureScaleAxis = GestureScaleAxis.both
+    private var _closestDataSetToTouch: IChartDataSet!
+    private var _panGestureReachedEdge: Bool = false
+    private weak var _outerScrollView: NSUIScrollView?
     
-    fileprivate var _lastPanPoint = CGPoint() /// This is to prevent using setTranslation which resets velocity
+    private var _lastPanPoint = CGPoint() /// This is to prevent using setTranslation which resets velocity
     
-    fileprivate var _decelerationLastTime: TimeInterval = 0.0
-    fileprivate var _decelerationDisplayLink: NSUIDisplayLink!
-    fileprivate var _decelerationVelocity = CGPoint()
+    private var _decelerationLastTime: TimeInterval = 0.0
+    private var _decelerationDisplayLink: NSUIDisplayLink!
+    private var _decelerationVelocity = CGPoint()
     
-    @objc fileprivate func tapGestureRecognized(_ recognizer: NSUITapGestureRecognizer)
+    @objc private func tapGestureRecognized(_ recognizer: NSUITapGestureRecognizer)
     {
         if _data === nil
         {
@@ -528,24 +541,24 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         
         if recognizer.state == NSUIGestureRecognizerState.ended
         {
-            if !self.isHighLightPerTapEnabled { return }
+            if !isHighLightPerTapEnabled { return }
             
             let h = getHighlightByTouchPoint(recognizer.location(in: self))
             
-            if h === nil || h!.isEqual(self.lastHighlighted)
+            if h === nil || h == self.lastHighlighted
             {
-                self.highlightValue(nil, callDelegate: true)
-                self.lastHighlighted = nil
+                lastHighlighted = nil
+                highlightValue(nil, callDelegate: true)
             }
             else
             {
-                self.highlightValue(h, callDelegate: true)
-                self.lastHighlighted = h
+                lastHighlighted = h
+                highlightValue(h, callDelegate: true)
             }
         }
     }
     
-    @objc fileprivate func doubleTapGestureRecognized(_ recognizer: NSUITapGestureRecognizer)
+    @objc private func doubleTapGestureRecognized(_ recognizer: NSUITapGestureRecognizer)
     {
         if _data === nil
         {
@@ -567,14 +580,18 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                 {
                     location.y = -(self.bounds.size.height - location.y - _viewPortHandler.offsetBottom)
                 }
-                
-                self.zoom(scaleX: isScaleXEnabled ? 1.4 : 1.0, scaleY: isScaleYEnabled ? 1.4 : 1.0, x: location.x, y: location.y)
+
+                let scaleX: CGFloat = isScaleXEnabled ? 1.4 : 1.0
+                let scaleY: CGFloat = isScaleYEnabled ? 1.4 : 1.0
+
+                self.zoom(scaleX: scaleX, scaleY: scaleY, x: location.x, y: location.y)
+                delegate?.chartScaled?(self, scaleX: scaleX, scaleY: scaleY)
             }
         }
     }
     
     #if !os(tvOS)
-    @objc fileprivate func pinchGestureRecognized(_ recognizer: NSUIPinchGestureRecognizer)
+    @objc private func pinchGestureRecognized(_ recognizer: NSUIPinchGestureRecognizer)
     {
         if recognizer.state == NSUIGestureRecognizerState.began
         {
@@ -650,7 +667,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                     
                     matrix = _viewPortHandler.touchMatrix.concatenating(matrix)
                     
-                    let _ = _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: true)
+                    _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: true)
                     
                     if delegate !== nil
                     {
@@ -664,13 +681,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
     #endif
     
-    @objc fileprivate func panGestureRecognized(_ recognizer: NSUIPanGestureRecognizer)
+    @objc private func panGestureRecognized(_ recognizer: NSUIPanGestureRecognizer)
     {
         if recognizer.state == NSUIGestureRecognizerState.began && recognizer.nsuiNumberOfTouches() > 0
         {
             stopDeceleration()
             
-            if _data === nil
+            if _data === nil || !self.isDragEnabled
             { // If we have no data, we have nothing to pan and no data to highlight
                 return
             }
@@ -678,15 +695,23 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
             // If drag is enabled and we are in a position where there's something to drag:
             //  * If we're zoomed in, then obviously we have something to drag.
             //  * If we have a drag offset - we always have something to drag
-            if self.isDragEnabled &&
-                (!self.hasNoDragOffset || !self.isFullyZoomedOut)
+            if !self.hasNoDragOffset || !self.isFullyZoomedOut
             {
                 _isDragging = true
                 
                 _closestDataSetToTouch = getDataSetByTouchPoint(point: recognizer.nsuiLocationOfTouch(0, inView: self))
                 
-                let translation = recognizer.translation(in: self)
-                let didUserDrag = (self is HorizontalBarChartView) ? translation.y != 0.0 : translation.x != 0.0
+                var translation = recognizer.translation(in: self)
+                if !self.dragXEnabled
+                {
+                    translation.x = 0.0
+                }
+                else if !self.dragYEnabled
+                {
+                    translation.y = 0.0
+                }
+                
+                let didUserDrag = translation.x != 0.0 || translation.y != 0.0
                 
                 // Check to see if user dragged at all and if so, can the chart be dragged by the given amount
                 if didUserDrag && !performPanChange(translation: translation)
@@ -721,7 +746,16 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
             if _isDragging
             {
                 let originalTranslation = recognizer.translation(in: self)
-                let translation = CGPoint(x: originalTranslation.x - _lastPanPoint.x, y: originalTranslation.y - _lastPanPoint.y)
+                var translation = CGPoint(x: originalTranslation.x - _lastPanPoint.x, y: originalTranslation.y - _lastPanPoint.y)
+                
+                if !self.dragXEnabled
+                {
+                    translation.x = 0.0
+                }
+                else if !self.dragYEnabled
+                {
+                    translation.y = 0.0
+                }
                 
                 let _ = performPanChange(translation: translation)
                 
@@ -733,9 +767,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                 
                 let lastHighlighted = self.lastHighlighted
                 
-                if ((h === nil && lastHighlighted !== nil) ||
-                    (h !== nil && lastHighlighted === nil) ||
-                    (h !== nil && lastHighlighted !== nil && !h!.isEqual(lastHighlighted)))
+                if h != lastHighlighted
                 {
                     self.lastHighlighted = h
                     self.highlightValue(h, callDelegate: true)
@@ -754,10 +786,12 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                     _decelerationVelocity = recognizer.velocity(in: self)
                     
                     _decelerationDisplayLink = NSUIDisplayLink(target: self, selector: #selector(BarLineChartViewBase.decelerationLoop))
-                    _decelerationDisplayLink.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
+                    _decelerationDisplayLink.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
                 }
                 
                 _isDragging = false
+                
+                delegate?.chartViewDidEndPanning?(self)
             }
             
             if _outerScrollView !== nil
@@ -768,7 +802,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         }
     }
     
-    fileprivate func performPanChange(translation: CGPoint) -> Bool
+    private func performPanChange(translation: CGPoint) -> Bool
     {
         var translation = translation
         
@@ -791,7 +825,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         
         matrix = _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: true)
         
-        if delegate !== nil
+        if matrix != originalMatrix
         {
             delegate?.chartTranslated?(self, dX: translation.x, dY: translation.y)
         }
@@ -800,23 +834,23 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         return matrix.tx != originalMatrix.tx || matrix.ty != originalMatrix.ty
     }
     
-    fileprivate func isTouchInverted() -> Bool
+    private func isTouchInverted() -> Bool
     {
         return isAnyAxisInverted &&
             _closestDataSetToTouch !== nil &&
             getAxis(_closestDataSetToTouch.axisDependency).isInverted
     }
     
-    open func stopDeceleration()
+    @objc open func stopDeceleration()
     {
         if _decelerationDisplayLink !== nil
         {
-            _decelerationDisplayLink.remove(from: RunLoop.main, forMode: RunLoopMode.commonModes)
+            _decelerationDisplayLink.remove(from: RunLoop.main, forMode: RunLoop.Mode.common)
             _decelerationDisplayLink = nil
         }
     }
     
-    @objc fileprivate func decelerationLoop()
+    @objc private func decelerationLoop()
     {
         let currentTime = CACurrentMediaTime()
         
@@ -849,12 +883,15 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         }
     }
     
-    fileprivate func nsuiGestureRecognizerShouldBegin(_ gestureRecognizer: NSUIGestureRecognizer) -> Bool
+    private func nsuiGestureRecognizerShouldBegin(_ gestureRecognizer: NSUIGestureRecognizer) -> Bool
     {
         if gestureRecognizer == _panGestureRecognizer
         {
-            if _data === nil || !_dragEnabled ||
-                (self.hasNoDragOffset && self.isFullyZoomedOut && !self.isHighlightPerDragEnabled)
+            let velocity = _panGestureRecognizer.velocity(in: self)
+            if _data === nil || !isDragEnabled ||
+                (self.hasNoDragOffset && self.isFullyZoomedOut && !self.isHighlightPerDragEnabled) ||
+                (!_dragYEnabled && abs(velocity.y) > abs(velocity.x)) ||
+                (!_dragXEnabled && abs(velocity.y) < abs(velocity.x))
             {
                 return false
             }
@@ -862,13 +899,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         else
         {
             #if !os(tvOS)
-                if gestureRecognizer == _pinchGestureRecognizer
+            if gestureRecognizer == _pinchGestureRecognizer
+            {
+                if _data === nil || (!_pinchZoomEnabled && !_scaleXEnabled && !_scaleYEnabled)
                 {
-                    if _data === nil || (!_pinchZoomEnabled && !_scaleXEnabled && !_scaleYEnabled)
-                    {
-                        return false
-                    }
+                    return false
                 }
+            }
             #endif
         }
         
@@ -897,53 +934,40 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     open func gestureRecognizer(_ gestureRecognizer: NSUIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: NSUIGestureRecognizer) -> Bool
     {
         #if !os(tvOS)
-            if ((gestureRecognizer.isKind(of: NSUIPinchGestureRecognizer.self) &&
-                otherGestureRecognizer.isKind(of: NSUIPanGestureRecognizer.self)) ||
-                (gestureRecognizer.isKind(of: NSUIPanGestureRecognizer.self) &&
-                    otherGestureRecognizer.isKind(of: NSUIPinchGestureRecognizer.self)))
-            {
-                return true
-            }
+        if ((gestureRecognizer is NSUIPinchGestureRecognizer && otherGestureRecognizer is NSUIPanGestureRecognizer) ||
+            (gestureRecognizer is NSUIPanGestureRecognizer && otherGestureRecognizer is NSUIPinchGestureRecognizer))
+        {
+            return true
+        }
         #endif
         
-        if (gestureRecognizer.isKind(of: NSUIPanGestureRecognizer.self) &&
-            otherGestureRecognizer.isKind(of: NSUIPanGestureRecognizer.self) && (
-                gestureRecognizer == _panGestureRecognizer
-            ))
+        if gestureRecognizer is NSUIPanGestureRecognizer,
+            otherGestureRecognizer is NSUIPanGestureRecognizer,
+            gestureRecognizer == _panGestureRecognizer
         {
             var scrollView = self.superview
-            while (scrollView !== nil && !scrollView!.isKind(of: NSUIScrollView.self))
+            while scrollView != nil && !(scrollView is NSUIScrollView)
             {
                 scrollView = scrollView?.superview
             }
             
             // If there is two scrollview together, we pick the superview of the inner scrollview.
             // In the case of UITableViewWrepperView, the superview will be UITableView
-            if let superViewOfScrollView = scrollView?.superview
-                , superViewOfScrollView.isKind(of: NSUIScrollView.self)
+            if let superViewOfScrollView = scrollView?.superview,
+                superViewOfScrollView is NSUIScrollView
             {
                 scrollView = superViewOfScrollView
             }
 
             var foundScrollView = scrollView as? NSUIScrollView
             
-            if foundScrollView !== nil && !foundScrollView!.nsuiIsScrollEnabled
+            if !(foundScrollView?.nsuiIsScrollEnabled ?? true)
             {
                 foundScrollView = nil
             }
             
-            var scrollViewPanGestureRecognizer: NSUIGestureRecognizer!
-            
-            if foundScrollView !== nil
-            {
-                for scrollRecognizer in foundScrollView!.nsuiGestureRecognizers!
-                {
-                    if scrollRecognizer.isKind(of: NSUIPanGestureRecognizer.self)
-                    {
-                        scrollViewPanGestureRecognizer = scrollRecognizer as! NSUIPanGestureRecognizer
-                        break
-                    }
-                }
+            let scrollViewPanGestureRecognizer = foundScrollView?.nsuiGestureRecognizers?.first {
+                $0 is NSUIPanGestureRecognizer
             }
             
             if otherGestureRecognizer === scrollViewPanGestureRecognizer
@@ -960,12 +984,12 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// MARK: Viewport modifiers
     
     /// Zooms in by 1.4, into the charts center.
-    open func zoomIn()
+    @objc open func zoomIn()
     {
         let center = _viewPortHandler.contentCenter
         
         let matrix = _viewPortHandler.zoomIn(x: center.x, y: -center.y)
-        let _ = _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
+        _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
         
         // Range might have changed, which means that Y-axis labels could have changed in size, affecting Y-axis size. So we need to recalculate offsets.
         calculateOffsets()
@@ -973,12 +997,12 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
 
     /// Zooms out by 0.7, from the charts center.
-    open func zoomOut()
+    @objc open func zoomOut()
     {
         let center = _viewPortHandler.contentCenter
         
         let matrix = _viewPortHandler.zoomOut(x: center.x, y: -center.y)
-        let _ = _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
+        _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
 
         // Range might have changed, which means that Y-axis labels could have changed in size, affecting Y-axis size. So we need to recalculate offsets.
         calculateOffsets()
@@ -986,10 +1010,10 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
     
     /// Zooms out to original size.
-    open func resetZoom()
+    @objc open func resetZoom()
     {
         let matrix = _viewPortHandler.resetZoom()
-        let _ = _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
+        _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
         
         // Range might have changed, which means that Y-axis labels could have changed in size, affecting Y-axis size. So we need to recalculate offsets.
         calculateOffsets()
@@ -999,18 +1023,19 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// Zooms in or out by the given scale factor. x and y are the coordinates
     /// (in pixels) of the zoom center.
     ///
-    /// - parameter scaleX: if < 1 --> zoom out, if > 1 --> zoom in
-    /// - parameter scaleY: if < 1 --> zoom out, if > 1 --> zoom in
-    /// - parameter x:
-    /// - parameter y:
-    open func zoom(
+    /// - Parameters:
+    ///   - scaleX: if < 1 --> zoom out, if > 1 --> zoom in
+    ///   - scaleY: if < 1 --> zoom out, if > 1 --> zoom in
+    ///   - x:
+    ///   - y:
+    @objc open func zoom(
         scaleX: CGFloat,
                scaleY: CGFloat,
                x: CGFloat,
                y: CGFloat)
     {
         let matrix = _viewPortHandler.zoom(scaleX: scaleX, scaleY: scaleY, x: x, y: -y)
-        let _ = _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
+        _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
         
         // Range might have changed, which means that Y-axis labels could have changed in size, affecting Y-axis size. So we need to recalculate offsets.
         calculateOffsets()
@@ -1020,12 +1045,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// Zooms in or out by the given scale factor.
     /// x and y are the values (**not pixels**) of the zoom center.
     ///
-    /// - parameter scaleX: if < 1 --> zoom out, if > 1 --> zoom in
-    /// - parameter scaleY: if < 1 --> zoom out, if > 1 --> zoom in
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis:
-    open func zoom(
+    /// - Parameters:
+    ///   - scaleX: if < 1 --> zoom out, if > 1 --> zoom in
+    ///   - scaleY: if < 1 --> zoom out, if > 1 --> zoom in
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis:
+    @objc open func zoom(
         scaleX: CGFloat,
                scaleY: CGFloat,
                xValue: Double,
@@ -1046,12 +1072,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// Zooms to the center of the chart with the given scale factor.
     ///
-    /// - parameter scaleX: if < 1 --> zoom out, if > 1 --> zoom in
-    /// - parameter scaleY: if < 1 --> zoom out, if > 1 --> zoom in
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis:
-    open func zoomToCenter(
+    /// - Parameters:
+    ///   - scaleX: if < 1 --> zoom out, if > 1 --> zoom in
+    ///   - scaleY: if < 1 --> zoom out, if > 1 --> zoom in
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis:
+    @objc open func zoomToCenter(
         scaleX: CGFloat,
                scaleY: CGFloat)
     {
@@ -1061,19 +1088,20 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
             scaleY: scaleY,
             x: center.x,
             y: -center.y)
-        let _ = viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
+        viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
     }
     
     /// Zooms by the specified scale factor to the specified values on the specified axis.
     ///
-    /// - parameter scaleX:
-    /// - parameter scaleY:
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func zoomAndCenterViewAnimated(
+    /// - Parameters:
+    ///   - scaleX:
+    ///   - scaleY:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func zoomAndCenterViewAnimated(
         scaleX: CGFloat,
         scaleY: CGFloat,
         xValue: Double,
@@ -1108,14 +1136,15 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// Zooms by the specified scale factor to the specified values on the specified axis.
     ///
-    /// - parameter scaleX:
-    /// - parameter scaleY:
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func zoomAndCenterViewAnimated(
+    /// - Parameters:
+    ///   - scaleX:
+    ///   - scaleY:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func zoomAndCenterViewAnimated(
         scaleX: CGFloat,
         scaleY: CGFloat,
         xValue: Double,
@@ -1129,14 +1158,15 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// Zooms by the specified scale factor to the specified values on the specified axis.
     ///
-    /// - parameter scaleX:
-    /// - parameter scaleY:
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func zoomAndCenterViewAnimated(
+    /// - Parameters:
+    ///   - scaleX:
+    ///   - scaleY:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func zoomAndCenterViewAnimated(
         scaleX: CGFloat,
         scaleY: CGFloat,
         xValue: Double,
@@ -1148,23 +1178,23 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
     
     /// Resets all zooming and dragging and makes the chart fit exactly it's bounds.
-    open func fitScreen()
+    @objc open func fitScreen()
     {
         let matrix = _viewPortHandler.fitScreen()
-        let _ = _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
+        _viewPortHandler.refresh(newMatrix: matrix, chart: self, invalidate: false)
         
         calculateOffsets()
         setNeedsDisplay()
     }
     
     /// Sets the minimum scale value to which can be zoomed out. 1 = fitScreen
-    open func setScaleMinima(_ scaleX: CGFloat, scaleY: CGFloat)
+    @objc open func setScaleMinima(_ scaleX: CGFloat, scaleY: CGFloat)
     {
         _viewPortHandler.setMinimumScaleX(scaleX)
         _viewPortHandler.setMinimumScaleY(scaleY)
     }
     
-    open var visibleXRange: Double
+    @objc open var visibleXRange: Double
     {
         return abs(highestVisibleX - lowestVisibleX)
     }
@@ -1174,7 +1204,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// If this is e.g. set to 10, no more than a range of 10 values on the x-axis can be viewed at once without scrolling.
     ///
     /// If you call this method, chart must have data or it has no effect.
-    open func setVisibleXRangeMaximum(_ maxXRange: Double)
+    @objc open func setVisibleXRangeMaximum(_ maxXRange: Double)
     {
         let xScale = _xAxis.axisRange / maxXRange
         _viewPortHandler.setMinimumScaleX(CGFloat(xScale))
@@ -1185,7 +1215,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// If this is e.g. set to 10, no less than a range of 10 values on the x-axis can be viewed at once without scrolling.
     ///
     /// If you call this method, chart must have data or it has no effect.
-    open func setVisibleXRangeMinimum(_ minXRange: Double)
+    @objc open func setVisibleXRangeMinimum(_ minXRange: Double)
     {
         let xScale = _xAxis.axisRange / minXRange
         _viewPortHandler.setMaximumScaleX(CGFloat(xScale))
@@ -1197,7 +1227,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// at once without scrolling.
     ///
     /// If you call this method, chart must have data or it has no effect.
-    open func setVisibleXRange(minXRange: Double, maxXRange: Double)
+    @objc open func setVisibleXRange(minXRange: Double, maxXRange: Double)
     {
         let minScale = _xAxis.axisRange / maxXRange
         let maxScale = _xAxis.axisRange / minXRange
@@ -1208,9 +1238,10 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// Sets the size of the area (range on the y-axis) that should be maximum visible at once.
     ///
-    /// - parameter yRange:
-    /// - parameter axis: - the axis for which this limit should apply
-    open func setVisibleYRangeMaximum(_ maxYRange: Double, axis: YAxis.AxisDependency)
+    /// - Parameters:
+    ///   - yRange:
+    ///   - axis: - the axis for which this limit should apply
+    @objc open func setVisibleYRangeMaximum(_ maxYRange: Double, axis: YAxis.AxisDependency)
     {
         let yScale = getAxisRange(axis: axis) / maxYRange
         _viewPortHandler.setMinimumScaleY(CGFloat(yScale))
@@ -1218,9 +1249,10 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// Sets the size of the area (range on the y-axis) that should be minimum visible at once, no further zooming in possible.
     ///
-    /// - parameter yRange:
-    /// - parameter axis: - the axis for which this limit should apply
-    open func setVisibleYRangeMinimum(_ minYRange: Double, axis: YAxis.AxisDependency)
+    /// - Parameters:
+    ///   - yRange:
+    ///   - axis: - the axis for which this limit should apply
+    @objc open func setVisibleYRangeMinimum(_ minYRange: Double, axis: YAxis.AxisDependency)
     {
         let yScale = getAxisRange(axis: axis) / minYRange
         _viewPortHandler.setMaximumScaleY(CGFloat(yScale))
@@ -1228,10 +1260,11 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
 
     /// Limits the maximum and minimum y range that can be visible by pinching and zooming.
     ///
-    /// - parameter minYRange:
-    /// - parameter maxYRange:
-    /// - parameter axis:
-    open func setVisibleYRange(minYRange: Double, maxYRange: Double, axis: YAxis.AxisDependency)
+    /// - Parameters:
+    ///   - minYRange:
+    ///   - maxYRange:
+    ///   - axis:
+    @objc open func setVisibleYRange(minYRange: Double, maxYRange: Double, axis: YAxis.AxisDependency)
     {
         let minScale = getAxisRange(axis: axis) / minYRange
         let maxScale = getAxisRange(axis: axis) / maxYRange
@@ -1240,7 +1273,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// Moves the left side of the current viewport to the specified x-value.
     /// This also refreshes the chart by calling setNeedsDisplay().
-    open func moveViewToX(_ xValue: Double)
+    @objc open func moveViewToX(_ xValue: Double)
     {
         let job = MoveViewJob(
             viewPortHandler: viewPortHandler,
@@ -1255,9 +1288,10 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// Centers the viewport to the specified y-value on the y-axis.
     /// This also refreshes the chart by calling setNeedsDisplay().
     /// 
-    /// - parameter yValue:
-    /// - parameter axis: - which axis should be used as a reference for the y-axis
-    open func moveViewToY(_ yValue: Double, axis: YAxis.AxisDependency)
+    /// - Parameters:
+    ///   - yValue:
+    ///   - axis: - which axis should be used as a reference for the y-axis
+    @objc open func moveViewToY(_ yValue: Double, axis: YAxis.AxisDependency)
     {
         let yInView = getAxisRange(axis: axis) / Double(_viewPortHandler.scaleY)
         
@@ -1274,10 +1308,11 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// This will move the left side of the current viewport to the specified x-value on the x-axis, and center the viewport to the specified y-value on the y-axis.
     /// This also refreshes the chart by calling setNeedsDisplay().
     /// 
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: - which axis should be used as a reference for the y-axis
-    open func moveViewTo(xValue: Double, yValue: Double, axis: YAxis.AxisDependency)
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: - which axis should be used as a reference for the y-axis
+    @objc open func moveViewTo(xValue: Double, yValue: Double, axis: YAxis.AxisDependency)
     {
         let yInView = getAxisRange(axis: axis) / Double(_viewPortHandler.scaleY)
         
@@ -1294,12 +1329,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// This will move the left side of the current viewport to the specified x-position and center the viewport to the specified y-position animated.
     /// This also refreshes the chart by calling setNeedsDisplay().
     ///
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func moveViewToAnimated(
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func moveViewToAnimated(
         xValue: Double,
         yValue: Double,
         axis: YAxis.AxisDependency,
@@ -1329,12 +1365,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// This will move the left side of the current viewport to the specified x-position and center the viewport to the specified y-position animated.
     /// This also refreshes the chart by calling setNeedsDisplay().
     ///
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func moveViewToAnimated(
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func moveViewToAnimated(
         xValue: Double,
         yValue: Double,
         axis: YAxis.AxisDependency,
@@ -1347,12 +1384,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// This will move the left side of the current viewport to the specified x-position and center the viewport to the specified y-position animated.
     /// This also refreshes the chart by calling setNeedsDisplay().
     ///
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func moveViewToAnimated(
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func moveViewToAnimated(
         xValue: Double,
         yValue: Double,
         axis: YAxis.AxisDependency,
@@ -1364,10 +1402,11 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     /// This will move the center of the current viewport to the specified x-value and y-value.
     /// This also refreshes the chart by calling setNeedsDisplay().
     ///
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: - which axis should be used as a reference for the y-axis
-    open func centerViewTo(
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: - which axis should be used as a reference for the y-axis
+    @objc open func centerViewTo(
         xValue: Double,
         yValue: Double,
         axis: YAxis.AxisDependency)
@@ -1387,12 +1426,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// This will move the center of the current viewport to the specified x-value and y-value animated.
     ///
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func centerViewToAnimated(
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func centerViewToAnimated(
         xValue: Double,
         yValue: Double,
         axis: YAxis.AxisDependency,
@@ -1422,12 +1462,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// This will move the center of the current viewport to the specified x-value and y-value animated.
     ///
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func centerViewToAnimated(
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func centerViewToAnimated(
         xValue: Double,
         yValue: Double,
         axis: YAxis.AxisDependency,
@@ -1439,12 +1480,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     
     /// This will move the center of the current viewport to the specified x-value and y-value animated.
     ///
-    /// - parameter xValue:
-    /// - parameter yValue:
-    /// - parameter axis: which axis should be used as a reference for the y-axis
-    /// - parameter duration: the duration of the animation in seconds
-    /// - parameter easing:
-    open func centerViewToAnimated(
+    /// - Parameters:
+    ///   - xValue:
+    ///   - yValue:
+    ///   - axis: which axis should be used as a reference for the y-axis
+    ///   - duration: the duration of the animation in seconds
+    ///   - easing:
+    @objc open func centerViewToAnimated(
         xValue: Double,
         yValue: Double,
         axis: YAxis.AxisDependency,
@@ -1455,7 +1497,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
 
     /// Sets custom offsets for the current `ChartViewPort` (the offsets on the sides of the actual chart window). Setting this will prevent the chart from automatically calculating it's offsets. Use `resetViewPortOffsets()` to undo this.
     /// ONLY USE THIS WHEN YOU KNOW WHAT YOU ARE DOING, else use `setExtraOffsets(...)`.
-    open func setViewPortOffsets(left: CGFloat, top: CGFloat, right: CGFloat, bottom: CGFloat)
+    @objc open func setViewPortOffsets(left: CGFloat, top: CGFloat, right: CGFloat, bottom: CGFloat)
     {
         _customViewPortEnabled = true
         
@@ -1474,7 +1516,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
 
     /// Resets all custom offsets set via `setViewPortOffsets(...)` method. Allows the chart to again calculate all offsets automatically.
-    open func resetViewPortOffsets()
+    @objc open func resetViewPortOffsets()
     {
         _customViewPortEnabled = false
         calculateOffsets()
@@ -1482,8 +1524,8 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
 
     // MARK: - Accessors
     
-    /// - returns: The range of the specified axis.
-    open func getAxisRange(axis: YAxis.AxisDependency) -> Double
+    /// - Returns: The range of the specified axis.
+    @objc open func getAxisRange(axis: YAxis.AxisDependency) -> Double
     {
         if axis == .left
         {
@@ -1495,8 +1537,8 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         }
     }
 
-    /// - returns: The position (in pixels) the provided Entry has inside the chart view
-    open func getPosition(entry e: ChartDataEntry, axis: YAxis.AxisDependency) -> CGPoint
+    /// - Returns: The position (in pixels) the provided Entry has inside the chart view
+    @objc open func getPosition(entry e: ChartDataEntry, axis: YAxis.AxisDependency) -> CGPoint
     {
         var vals = CGPoint(x: CGFloat(e.x), y: CGFloat(e.y))
 
@@ -1506,41 +1548,65 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
 
     /// is dragging enabled? (moving the chart with the finger) for the chart (this does not affect scaling).
-    open var dragEnabled: Bool
+    @objc open var dragEnabled: Bool
     {
         get
         {
-            return _dragEnabled
+            return _dragXEnabled || _dragYEnabled
         }
         set
         {
-            if _dragEnabled != newValue
-            {
-                _dragEnabled = newValue
-            }
+            _dragYEnabled = newValue
+            _dragXEnabled = newValue
         }
     }
     
     /// is dragging enabled? (moving the chart with the finger) for the chart (this does not affect scaling).
-    open var isDragEnabled: Bool
+    @objc open var isDragEnabled: Bool
     {
         return dragEnabled
     }
     
+    /// is dragging on the X axis enabled?
+    @objc open var dragXEnabled: Bool
+    {
+        get
+        {
+            return _dragXEnabled
+        }
+        set
+        {
+            _dragXEnabled = newValue
+        }
+    }
+    
+    /// is dragging on the Y axis enabled?
+    @objc open var dragYEnabled: Bool
+    {
+        get
+        {
+            return _dragYEnabled
+        }
+        set
+        {
+            _dragYEnabled = newValue
+        }
+    }
+    
     /// is scaling enabled? (zooming in and out by gesture) for the chart (this does not affect dragging).
-    open func setScaleEnabled(_ enabled: Bool)
+    @objc open func setScaleEnabled(_ enabled: Bool)
     {
         if _scaleXEnabled != enabled || _scaleYEnabled != enabled
         {
             _scaleXEnabled = enabled
             _scaleYEnabled = enabled
             #if !os(tvOS)
-                _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
+            _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
             #endif
         }
     }
     
-    open var scaleXEnabled: Bool
+    @objc open var scaleXEnabled: Bool
     {
         get
         {
@@ -1552,13 +1618,13 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
             {
                 _scaleXEnabled = newValue
                 #if !os(tvOS)
-                    _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
+                _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
                 #endif
             }
         }
     }
     
-    open var scaleYEnabled: Bool
+    @objc open var scaleYEnabled: Bool
     {
         get
         {
@@ -1570,17 +1636,17 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
             {
                 _scaleYEnabled = newValue
                 #if !os(tvOS)
-                    _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
+                _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
                 #endif
             }
         }
     }
     
-    open var isScaleXEnabled: Bool { return scaleXEnabled }
-    open var isScaleYEnabled: Bool { return scaleYEnabled }
+    @objc open var isScaleXEnabled: Bool { return scaleXEnabled }
+    @objc open var isScaleYEnabled: Bool { return scaleYEnabled }
     
     /// flag that indicates if double tap zoom is enabled or not
-    open var doubleTapToZoomEnabled: Bool
+    @objc open var doubleTapToZoomEnabled: Bool
     {
         get
         {
@@ -1597,56 +1663,56 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
     
     /// **default**: true
-    /// - returns: `true` if zooming via double-tap is enabled `false` ifnot.
-    open var isDoubleTapToZoomEnabled: Bool
+    /// `true` if zooming via double-tap is enabled `false` ifnot.
+    @objc open var isDoubleTapToZoomEnabled: Bool
     {
         return doubleTapToZoomEnabled
     }
     
     /// flag that indicates if highlighting per dragging over a fully zoomed out chart is enabled
-    open var highlightPerDragEnabled = true
+    @objc open var highlightPerDragEnabled = true
     
     /// If set to true, highlighting per dragging over a fully zoomed out chart is enabled
     /// You might want to disable this when using inside a `NSUIScrollView`
     /// 
     /// **default**: true
-    open var isHighlightPerDragEnabled: Bool
+    @objc open var isHighlightPerDragEnabled: Bool
     {
         return highlightPerDragEnabled
     }
     
     /// **default**: true
-    /// - returns: `true` if drawing the grid background is enabled, `false` ifnot.
-    open var isDrawGridBackgroundEnabled: Bool
+    /// `true` if drawing the grid background is enabled, `false` ifnot.
+    @objc open var isDrawGridBackgroundEnabled: Bool
     {
         return drawGridBackgroundEnabled
     }
     
     /// **default**: false
-    /// - returns: `true` if drawing the borders rectangle is enabled, `false` ifnot.
-    open var isDrawBordersEnabled: Bool
+    /// `true` if drawing the borders rectangle is enabled, `false` ifnot.
+    @objc open var isDrawBordersEnabled: Bool
     {
         return drawBordersEnabled
     }
 
-    /// - returns: The x and y values in the chart at the given touch point
+    /// - Returns: The x and y values in the chart at the given touch point
     /// (encapsulated in a `CGPoint`). This method transforms pixel coordinates to
     /// coordinates / values in the chart. This is the opposite method to
     /// `getPixelsForValues(...)`.
-    open func valueForTouchPoint(point pt: CGPoint, axis: YAxis.AxisDependency) -> CGPoint
+    @objc open func valueForTouchPoint(point pt: CGPoint, axis: YAxis.AxisDependency) -> CGPoint
     {
         return getTransformer(forAxis: axis).valueForTouchPoint(pt)
     }
 
     /// Transforms the given chart values into pixels. This is the opposite
     /// method to `valueForTouchPoint(...)`.
-    open func pixelForValues(x: Double, y: Double, axis: YAxis.AxisDependency) -> CGPoint
+    @objc open func pixelForValues(x: Double, y: Double, axis: YAxis.AxisDependency) -> CGPoint
     {
         return getTransformer(forAxis: axis).pixelForValues(x: x, y: y)
     }
     
-    /// - returns: The Entry object displayed at the touched position of the chart
-    open func getEntryByTouchPoint(point pt: CGPoint) -> ChartDataEntry!
+    /// - Returns: The Entry object displayed at the touched position of the chart
+    @objc open func getEntryByTouchPoint(point pt: CGPoint) -> ChartDataEntry!
     {
         if let h = getHighlightByTouchPoint(pt)
         {
@@ -1655,19 +1721,19 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         return nil
     }
     
-    /// - returns: The DataSet object displayed at the touched position of the chart
-    open func getDataSetByTouchPoint(point pt: CGPoint) -> IBarLineScatterCandleBubbleChartDataSet!
+    /// - Returns: The DataSet object displayed at the touched position of the chart
+    @objc open func getDataSetByTouchPoint(point pt: CGPoint) -> IBarLineScatterCandleBubbleChartDataSet?
     {
         let h = getHighlightByTouchPoint(pt)
         if h !== nil
         {
-            return _data?.getDataSetByIndex(h!.dataSetIndex) as! IBarLineScatterCandleBubbleChartDataSet!
+            return _data?.getDataSetByIndex(h!.dataSetIndex) as? IBarLineScatterCandleBubbleChartDataSet
         }
         return nil
     }
 
-    /// - returns: The current x-scale factor
-    open var scaleX: CGFloat
+    /// The current x-scale factor
+    @objc open var scaleX: CGFloat
     {
         if _viewPortHandler === nil
         {
@@ -1676,8 +1742,8 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         return _viewPortHandler.scaleX
     }
 
-    /// - returns: The current y-scale factor
-    open var scaleY: CGFloat
+    /// The current y-scale factor
+    @objc open var scaleY: CGFloat
     {
         if _viewPortHandler === nil
         {
@@ -1687,35 +1753,24 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
     }
 
     /// if the chart is fully zoomed out, return true
-    open var isFullyZoomedOut: Bool { return _viewPortHandler.isFullyZoomedOut }
+    @objc open var isFullyZoomedOut: Bool { return _viewPortHandler.isFullyZoomedOut }
 
-    /// - returns: The left y-axis object. In the horizontal bar-chart, this is the
-    /// top axis.
-    open var leftAxis: YAxis
-    {
-        return _leftAxis
-    }
-
-    /// - returns: The right y-axis object. In the horizontal bar-chart, this is the
-    /// bottom axis.
-    open var rightAxis: YAxis { return _rightAxis }
-
-    /// - returns: The y-axis object to the corresponding AxisDependency. In the
+    /// - Returns: The y-axis object to the corresponding AxisDependency. In the
     /// horizontal bar-chart, LEFT == top, RIGHT == BOTTOM
-    open func getAxis(_ axis: YAxis.AxisDependency) -> YAxis
+    @objc open func getAxis(_ axis: YAxis.AxisDependency) -> YAxis
     {
         if axis == .left
         {
-            return _leftAxis
+            return leftAxis
         }
         else
         {
-            return _rightAxis
+            return rightAxis
         }
     }
     
     /// flag that indicates if pinch-zoom is enabled. if true, both x and y axis can be scaled simultaneously with 2 fingers, if false, x and y axis can be scaled separately
-    open var pinchZoomEnabled: Bool
+    @objc open var pinchZoomEnabled: Bool
     {
         get
         {
@@ -1727,60 +1782,33 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
             {
                 _pinchZoomEnabled = newValue
                 #if !os(tvOS)
-                    _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
+                _pinchGestureRecognizer.isEnabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled
                 #endif
             }
         }
     }
 
     /// **default**: false
-    /// - returns: `true` if pinch-zoom is enabled, `false` ifnot
-    open var isPinchZoomEnabled: Bool { return pinchZoomEnabled }
+    /// `true` if pinch-zoom is enabled, `false` ifnot
+    @objc open var isPinchZoomEnabled: Bool { return pinchZoomEnabled }
 
     /// Set an offset in dp that allows the user to drag the chart over it's
     /// bounds on the x-axis.
-    open func setDragOffsetX(_ offset: CGFloat)
+    @objc open func setDragOffsetX(_ offset: CGFloat)
     {
         _viewPortHandler.setDragOffsetX(offset)
     }
 
     /// Set an offset in dp that allows the user to drag the chart over it's
     /// bounds on the y-axis.
-    open func setDragOffsetY(_ offset: CGFloat)
+    @objc open func setDragOffsetY(_ offset: CGFloat)
     {
         _viewPortHandler.setDragOffsetY(offset)
     }
 
-    /// - returns: `true` if both drag offsets (x and y) are zero or smaller.
-    open var hasNoDragOffset: Bool { return _viewPortHandler.hasNoDragOffset }
+    /// `true` if both drag offsets (x and y) are zero or smaller.
+    @objc open var hasNoDragOffset: Bool { return _viewPortHandler.hasNoDragOffset }
 
-    /// The X axis renderer. This is a read-write property so you can set your own custom renderer here.
-    /// **default**: An instance of XAxisRenderer
-    /// - returns: The current set X axis renderer
-    open var xAxisRenderer: XAxisRenderer
-    {
-        get { return _xAxisRenderer }
-        set { _xAxisRenderer = newValue }
-    }
-    
-    /// The left Y axis renderer. This is a read-write property so you can set your own custom renderer here.
-    /// **default**: An instance of YAxisRenderer
-    /// - returns: The current set left Y axis renderer
-    open var leftYAxisRenderer: YAxisRenderer
-    {
-        get { return _leftYAxisRenderer }
-        set { _leftYAxisRenderer = newValue }
-    }
-    
-    /// The right Y axis renderer. This is a read-write property so you can set your own custom renderer here.
-    /// **default**: An instance of YAxisRenderer
-    /// - returns: The current set right Y axis renderer
-    open var rightYAxisRenderer: YAxisRenderer
-    {
-        get { return _rightYAxisRenderer }
-        set { _rightYAxisRenderer = newValue }
-    }
-    
     open override var chartYMax: Double
     {
         return max(leftAxis._axisMaximum, rightAxis._axisMaximum)
@@ -1791,96 +1819,98 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         return min(leftAxis._axisMinimum, rightAxis._axisMinimum)
     }
     
-    /// - returns: `true` if either the left or the right or both axes are inverted.
-    open var isAnyAxisInverted: Bool
+    /// `true` if either the left or the right or both axes are inverted.
+    @objc open var isAnyAxisInverted: Bool
     {
-        return _leftAxis.isInverted || _rightAxis.isInverted
+        return leftAxis.isInverted || rightAxis.isInverted
     }
     
     /// flag that indicates if auto scaling on the y axis is enabled.
     /// if yes, the y axis automatically adjusts to the min and max y values of the current x axis range whenever the viewport changes
-    open var autoScaleMinMaxEnabled: Bool
+    @objc open var autoScaleMinMaxEnabled: Bool
     {
         get { return _autoScaleMinMaxEnabled }
         set { _autoScaleMinMaxEnabled = newValue }
     }
     
     /// **default**: false
-    /// - returns: `true` if auto scaling on the y axis is enabled.
-    open var isAutoScaleMinMaxEnabled : Bool { return autoScaleMinMaxEnabled }
+    /// `true` if auto scaling on the y axis is enabled.
+    @objc open var isAutoScaleMinMaxEnabled : Bool { return autoScaleMinMaxEnabled }
     
     /// Sets a minimum width to the specified y axis.
-    open func setYAxisMinWidth(_ axis: YAxis.AxisDependency, width: CGFloat)
+    @objc open func setYAxisMinWidth(_ axis: YAxis.AxisDependency, width: CGFloat)
     {
         if axis == .left
         {
-            _leftAxis.minWidth = width
+            leftAxis.minWidth = width
         }
         else
         {
-            _rightAxis.minWidth = width
+            rightAxis.minWidth = width
         }
     }
     
     /// **default**: 0.0
-    /// - returns: The (custom) minimum width of the specified Y axis.
-    open func getYAxisMinWidth(_ axis: YAxis.AxisDependency) -> CGFloat
+    ///
+    /// - Returns: The (custom) minimum width of the specified Y axis.
+    @objc open func getYAxisMinWidth(_ axis: YAxis.AxisDependency) -> CGFloat
     {
         if axis == .left
         {
-            return _leftAxis.minWidth
+            return leftAxis.minWidth
         }
         else
         {
-            return _rightAxis.minWidth
+            return rightAxis.minWidth
         }
     }
     /// Sets a maximum width to the specified y axis.
     /// Zero (0.0) means there's no maximum width
-    open func setYAxisMaxWidth(_ axis: YAxis.AxisDependency, width: CGFloat)
+    @objc open func setYAxisMaxWidth(_ axis: YAxis.AxisDependency, width: CGFloat)
     {
         if axis == .left
         {
-            _leftAxis.maxWidth = width
+            leftAxis.maxWidth = width
         }
         else
         {
-            _rightAxis.maxWidth = width
+            rightAxis.maxWidth = width
         }
     }
     
     /// Zero (0.0) means there's no maximum width
     ///
     /// **default**: 0.0 (no maximum specified)
-    /// - returns: The (custom) maximum width of the specified Y axis.
-    open func getYAxisMaxWidth(_ axis: YAxis.AxisDependency) -> CGFloat
+    ///
+    /// - Returns: The (custom) maximum width of the specified Y axis.
+    @objc open func getYAxisMaxWidth(_ axis: YAxis.AxisDependency) -> CGFloat
     {
         if axis == .left
         {
-            return _leftAxis.maxWidth
+            return leftAxis.maxWidth
         }
         else
         {
-            return _rightAxis.maxWidth
+            return rightAxis.maxWidth
         }
     }
 
-    /// - returns the width of the specified y axis.
-    open func getYAxisWidth(_ axis: YAxis.AxisDependency) -> CGFloat
+    /// - Returns the width of the specified y axis.
+    @objc open func getYAxisWidth(_ axis: YAxis.AxisDependency) -> CGFloat
     {
         if axis == .left
         {
-            return _leftAxis.requiredSize().width
+            return leftAxis.requiredSize().width
         }
         else
         {
-            return _rightAxis.requiredSize().width
+            return rightAxis.requiredSize().width
         }
     }
     
     // MARK: - BarLineScatterCandleBubbleChartDataProvider
     
-    /// - returns: The Transformer class that contains all matrices and is
+    /// - Returns: The Transformer class that contains all matrices and is
     /// responsible for transforming values into pixels on the screen and
     /// backwards.
     open func getTransformer(forAxis axis: YAxis.AxisDependency) -> Transformer
@@ -1913,7 +1943,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         return getAxis(axis).isInverted
     }
     
-    /// - returns: The lowest x-index (value on the x-axis) that is still visible on he chart.
+    /// The lowest x-index (value on the x-axis) that is still visible on he chart.
     open var lowestVisibleX: Double
     {
         var pt = CGPoint(
@@ -1925,7 +1955,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
         return max(xAxis._axisMinimum, Double(pt.x))
     }
     
-    /// - returns: The highest x-index (value on the x-axis) that is still visible on the chart.
+    /// The highest x-index (value on the x-axis) that is still visible on the chart.
     open var highestVisibleX: Double
     {
         var pt = CGPoint(
diff --git a/Source/Charts/Charts/BubbleChartView.swift b/Source/Charts/Charts/BubbleChartView.swift
index 66fe85355b..1b13677564 100644
--- a/Source/Charts/Charts/BubbleChartView.swift
+++ b/Source/Charts/Charts/BubbleChartView.swift
@@ -21,7 +21,7 @@ open class BubbleChartView: BarLineChartViewBase, BubbleChartDataProvider
         renderer = BubbleChartRenderer(dataProvider: self, animator: _animator, viewPortHandler: _viewPortHandler)
     }
     
-    // MARK: - BubbleChartDataProbider
+    // MARK: - BubbleChartDataProvider
     
     open var bubbleData: BubbleChartData? { return _data as? BubbleChartData }
 }
diff --git a/Source/Charts/Charts/ChartViewBase.swift b/Source/Charts/Charts/ChartViewBase.swift
old mode 100755
new mode 100644
index f0e6a3907c..c453aced0c
--- a/Source/Charts/Charts/ChartViewBase.swift
+++ b/Source/Charts/Charts/ChartViewBase.swift
@@ -13,18 +13,27 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 @objc
 public protocol ChartViewDelegate
 {
     /// Called when a value has been selected inside the chart.
-    /// - parameter entry: The selected Entry.
-    /// - parameter highlight: The corresponding highlight object that contains information about the highlighted position such as dataSetIndex etc.
+    ///
+    /// - Parameters:
+    ///   - entry: The selected Entry.
+    ///   - highlight: The corresponding highlight object that contains information about the highlighted position such as dataSetIndex etc.
     @objc optional func chartValueSelected(_ chartView: ChartViewBase, entry: ChartDataEntry, highlight: Highlight)
     
+    /// Called when a user stops panning between values on the chart
+    @objc optional func chartViewDidEndPanning(_ chartView: ChartViewBase)
+    
     // Called when nothing has been selected or an "un-select" has been made.
     @objc optional func chartValueNothingSelected(_ chartView: ChartViewBase)
     
@@ -33,16 +42,19 @@ public protocol ChartViewDelegate
     
     // Callbacks when the chart is moved / translated via drag gesture.
     @objc optional func chartTranslated(_ chartView: ChartViewBase, dX: CGFloat, dY: CGFloat)
+
+    // Callbacks when Animator stops animating
+    @objc optional func chartView(_ chartView: ChartViewBase, animatorDidStop animator: Animator)
 }
 
 open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
 {
     // MARK: - Properties
     
-    /// - returns: The object representing all x-labels, this method can be used to
+    /// - Returns: The object representing all x-labels, this method can be used to
     /// acquire the XAxis object and modify it (e.g. change the position of the
     /// labels)
-    open var xAxis: XAxis
+    @objc open var xAxis: XAxis
     {
         return _xAxis
     }
@@ -54,14 +66,14 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     internal var _data: ChartData?
     
     /// Flag that indicates if highlighting per tap (touch) is enabled
-    fileprivate var _highlightPerTapEnabled = true
+    private var _highlightPerTapEnabled = true
     
     /// If set to true, chart continues to scroll after touch up
-    open var dragDecelerationEnabled = true
+    @objc open var dragDecelerationEnabled = true
     
     /// Deceleration friction coefficient in [0 ; 1] interval, higher values indicate that speed will decrease slowly, for example if it set to 0, it will stop immediately.
     /// 1 is an invalid value, and will be converted to 0.999 automatically.
-    fileprivate var _dragDecelerationFrictionCoef: CGFloat = 0.9
+    private var _dragDecelerationFrictionCoef: CGFloat = 0.9
     
     /// if true, units are drawn next to the values in the chart
     internal var _drawUnitInChart = false
@@ -71,81 +83,32 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     
     /// The `Description` object of the chart.
     /// This should have been called just "description", but
-    open var chartDescription: Description?
-    
-    /// This property is deprecated - Use `chartDescription.text` instead.
-    @available(*, deprecated: 1.0, message: "Use `chartDescription.text` instead.")
-    open var descriptionText: String
-    {
-        get { return chartDescription?.text ?? "" }
-        set { chartDescription?.text = newValue }
-    }
-    
-    /// This property is deprecated - Use `chartDescription.font` instead.
-    @available(*, deprecated: 1.0, message: "Use `chartDescription.font` instead.")
-    open var descriptionFont: NSUIFont?
-    {
-        get { return chartDescription?.font }
-        set
-        {
-            if let value = newValue
-            {
-                chartDescription?.font = value
-            }
-        }
-    }
-    
-    /// This property is deprecated - Use `chartDescription.textColor` instead.
-    @available(*, deprecated: 1.0, message: "Use `chartDescription.textColor` instead.")
-    open var descriptionTextColor: NSUIColor?
-    {
-        get { return chartDescription?.textColor }
-        set
-        {
-            if let value = newValue
-            {
-                chartDescription?.textColor = value
-            }
-        }
-    }
-    
-    /// This property is deprecated - Use `chartDescription.textAlign` instead.
-    @available(*, deprecated: 1.0, message: "Use `chartDescription.textAlign` instead.")
-    open var descriptionTextAlign: NSTextAlignment
-    {
-        get { return chartDescription?.textAlign ?? NSTextAlignment.right }
-        set { chartDescription?.textAlign = newValue }
-    }
-    
-    /// This property is deprecated - Use `chartDescription.position` instead.
-    @available(*, deprecated: 1.0, message: "Use `chartDescription.position` instead.")
-    open var descriptionTextPosition: CGPoint?
-    {
-        get { return chartDescription?.position }
-        set { chartDescription?.position = newValue }
-    }
-    
+    @objc open var chartDescription: Description?
+        
     /// The legend object containing all data associated with the legend
     internal var _legend: Legend!
     
     /// delegate to receive chart events
-    open weak var delegate: ChartViewDelegate?
+    @objc open weak var delegate: ChartViewDelegate?
     
     /// text that is displayed when the chart is empty
-    open var noDataText = "No chart data available."
+    @objc open var noDataText = "No chart data available."
     
     /// Font to be used for the no data text.
-    open var noDataFont: NSUIFont! = NSUIFont(name: "HelveticaNeue", size: 12.0)
+    @objc open var noDataFont = NSUIFont.systemFont(ofSize: 12)
     
     /// color of the no data text
-    open var noDataTextColor: NSUIColor = NSUIColor.black
-    
+    @objc open var noDataTextColor: NSUIColor = .labelOrBlack
+
+    /// alignment of the no data text
+    @objc open var noDataTextAlignment: NSTextAlignment = .left
+
     internal var _legendRenderer: LegendRenderer!
     
     /// object responsible for rendering the data
-    open var renderer: DataRenderer?
+    @objc open var renderer: DataRenderer?
     
-    open var highlighter: IHighlighter?
+    @objc open var highlighter: IHighlighter?
     
     /// object that manages the bounds and drawing constraints of the chart
     internal var _viewPortHandler: ViewPortHandler!
@@ -154,37 +117,37 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     internal var _animator: Animator!
     
     /// flag that indicates if offsets calculation has already been done or not
-    fileprivate var _offsetsCalculated = false
-	
+    private var _offsetsCalculated = false
+    
     /// array of Highlight objects that reference the highlighted slices in the chart
     internal var _indicesToHighlight = [Highlight]()
     
     /// `true` if drawing the marker is enabled when tapping on values
     /// (use the `marker` property to specify a marker)
-    open var drawMarkers = true
+    @objc open var drawMarkers = true
     
-    /// - returns: `true` if drawing the marker is enabled when tapping on values
+    /// - Returns: `true` if drawing the marker is enabled when tapping on values
     /// (use the `marker` property to specify a marker)
-    open var isDrawMarkersEnabled: Bool { return drawMarkers }
+    @objc open var isDrawMarkersEnabled: Bool { return drawMarkers }
     
     /// The marker that is displayed when a value is clicked on the chart
-    open var marker: IMarker?
+    @objc open var marker: IMarker?
     
-    fileprivate var _interceptTouchEvents = false
+    private var _interceptTouchEvents = false
     
     /// An extra offset to be appended to the viewport's top
-    open var extraTopOffset: CGFloat = 0.0
+    @objc open var extraTopOffset: CGFloat = 0.0
     
     /// An extra offset to be appended to the viewport's right
-    open var extraRightOffset: CGFloat = 0.0
+    @objc open var extraRightOffset: CGFloat = 0.0
     
     /// An extra offset to be appended to the viewport's bottom
-    open var extraBottomOffset: CGFloat = 0.0
+    @objc open var extraBottomOffset: CGFloat = 0.0
     
     /// An extra offset to be appended to the viewport's left
-    open var extraLeftOffset: CGFloat = 0.0
+    @objc open var extraLeftOffset: CGFloat = 0.0
     
-    open func setExtraOffsets(left: CGFloat, top: CGFloat, right: CGFloat, bottom: CGFloat)
+    @objc open func setExtraOffsets(left: CGFloat, top: CGFloat, right: CGFloat, bottom: CGFloat)
     {
         extraLeftOffset = left
         extraTopOffset = top
@@ -215,14 +178,13 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     internal func initialize()
     {
         #if os(iOS)
-            self.backgroundColor = NSUIColor.clear
+        self.backgroundColor = NSUIColor.clear
         #endif
 
         _animator = Animator()
         _animator.delegate = self
 
-        _viewPortHandler = ViewPortHandler()
-        _viewPortHandler.setChartDimens(width: bounds.size.width, height: bounds.size.height)
+        _viewPortHandler = ViewPortHandler(width: bounds.size.width, height: bounds.size.height)
         
         chartDescription = Description()
         
@@ -249,15 +211,16 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
             _data = newValue
             _offsetsCalculated = false
             
-            if _data == nil
+            guard let _data = _data else
             {
+                setNeedsDisplay()
                 return
             }
             
             // calculate how many digits are needed
-            setupDefaultFormatter(min: _data!.getYMin(), max: _data!.getYMax())
+            setupDefaultFormatter(min: _data.getYMin(), max: _data.getYMax())
             
-            for set in _data!.dataSets
+            for set in _data.dataSets
             {
                 if set.needsFormatter || set.valueFormatter === _defaultValueFormatter
                 {
@@ -271,25 +234,25 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     }
     
     /// Clears the chart from all data (sets it to null) and refreshes it (by calling setNeedsDisplay()).
-    open func clear()
+    @objc open func clear()
     {
         _data = nil
         _offsetsCalculated = false
         _indicesToHighlight.removeAll()
-	    lastHighlighted = nil
-	
+        lastHighlighted = nil
+    
         setNeedsDisplay()
     }
     
     /// Removes all DataSets (and thereby Entries) from the chart. Does not set the data object to nil. Also refreshes the chart by calling setNeedsDisplay().
-    open func clearValues()
+    @objc open func clearValues()
     {
         _data?.clearValues()
         setNeedsDisplay()
     }
 
-    /// - returns: `true` if the chart is empty (meaning it's data object is either null or contains no entries).
-    open func isEmpty() -> Bool
+    /// - Returns: `true` if the chart is empty (meaning it's data object is either null or contains no entries).
+    @objc open func isEmpty() -> Bool
     {
         guard let data = _data else { return true }
 
@@ -305,7 +268,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     
     /// Lets the chart know its underlying data has changed and should perform all necessary recalculations.
     /// It is crucial that this method is called everytime data is changed dynamically. Not calling this method can lead to crashes or unexpected behaviour.
-    open func notifyDataSetChanged()
+    @objc open func notifyDataSetChanged()
     {
         fatalError("notifyDataSetChanged() cannot be called on ChartViewBase")
     }
@@ -343,7 +306,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         if _defaultValueFormatter is DefaultValueFormatter
         {
             // setup the formatter with a new number of digits
-            let digits = ChartUtils.decimals(reference)
+            let digits = reference.decimalPlaces
             
             (_defaultValueFormatter as? DefaultValueFormatter)?.decimals
              = digits
@@ -357,18 +320,24 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         
         let frame = self.bounds
 
-        if _data === nil && noDataText.characters.count > 0
+        if _data === nil && noDataText.count > 0
         {
             context.saveGState()
             defer { context.restoreGState() }
-            
+
+            let paragraphStyle = NSMutableParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
+            paragraphStyle.minimumLineHeight = noDataFont.lineHeight
+            paragraphStyle.lineBreakMode = .byWordWrapping
+            paragraphStyle.alignment = noDataTextAlignment
+
             ChartUtils.drawMultilineText(
                 context: context,
                 text: noDataText,
                 point: CGPoint(x: frame.width / 2.0, y: frame.height / 2.0),
                 attributes:
-                [NSFontAttributeName: noDataFont,
-                 NSForegroundColorAttributeName: noDataTextColor],
+                [.font: noDataFont,
+                 .foregroundColor: noDataTextColor,
+                 .paragraphStyle: paragraphStyle],
                 constrainedToSize: self.bounds.size,
                 anchor: CGPoint(x: 0.5, y: 0.5),
                 angleRadians: 0.0)
@@ -391,37 +360,35 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
             let description = chartDescription,
             description.isEnabled,
             let descriptionText = description.text,
-            descriptionText.characters.count > 0
+            descriptionText.count > 0
             else { return }
         
-        var position = description.position
-
-        // if no position specified, draw on default position
-        if position == nil
-        {
-            let frame = self.bounds
-            position = CGPoint(
-                x: frame.width - _viewPortHandler.offsetRight - description.xOffset,
-                y: frame.height - _viewPortHandler.offsetBottom - description.yOffset - description.font.lineHeight)
-        }
+        let position = description.position ?? CGPoint(x: bounds.width - _viewPortHandler.offsetRight - description.xOffset,
+                                                       y: bounds.height - _viewPortHandler.offsetBottom - description.yOffset - description.font.lineHeight)
         
-        var attrs = [String : AnyObject]()
+        var attrs = [NSAttributedString.Key : Any]()
         
-        attrs[NSFontAttributeName] = description.font
-        attrs[NSForegroundColorAttributeName] = description.textColor
+        attrs[NSAttributedString.Key.font] = description.font
+        attrs[NSAttributedString.Key.foregroundColor] = description.textColor
 
         ChartUtils.drawText(
             context: context,
             text: descriptionText,
-            point: position!,
+            point: position,
             align: description.textAlign,
             attributes: attrs)
     }
     
+    // MARK: - Accessibility
+
+    open override func accessibilityChildren() -> [Any]? {
+        return renderer?.accessibleChartElements
+    }
+
     // MARK: - Highlighting
     
-    /// - returns: The array of currently highlighted values. This might an empty if nothing is highlighted.
-    open var highlighted: [Highlight]
+    /// The array of currently highlighted values. This might an empty if nothing is highlighted.
+    @objc open var highlighted: [Highlight]
     {
         return _indicesToHighlight
     }
@@ -429,30 +396,31 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     /// Set this to false to prevent values from being highlighted by tap gesture.
     /// Values can still be highlighted via drag or programmatically.
     /// **default**: true
-    open var highlightPerTapEnabled: Bool
+    @objc open var highlightPerTapEnabled: Bool
     {
         get { return _highlightPerTapEnabled }
         set { _highlightPerTapEnabled = newValue }
     }
     
-    /// - returns: `true` if values can be highlighted via tap gesture, `false` ifnot.
-    open var isHighLightPerTapEnabled: Bool
+    /// `true` if values can be highlighted via tap gesture, `false` ifnot.
+    @objc open var isHighLightPerTapEnabled: Bool
     {
         return highlightPerTapEnabled
     }
     
     /// Checks if the highlight array is null, has a length of zero or if the first object is null.
-    /// - returns: `true` if there are values to highlight, `false` ifthere are no values to highlight.
-    open func valuesToHighlight() -> Bool
+    ///
+    /// - Returns: `true` if there are values to highlight, `false` ifthere are no values to highlight.
+    @objc open func valuesToHighlight() -> Bool
     {
-        return _indicesToHighlight.count > 0
+        return !_indicesToHighlight.isEmpty
     }
 
     /// Highlights the values at the given indices in the given DataSets. Provide
     /// null or an empty array to undo all highlighting. 
     /// This should be used to programmatically highlight values.
     /// This method *will not* call the delegate.
-    open func highlightValues(_ highs: [Highlight]?)
+    @objc open func highlightValues(_ highs: [Highlight]?)
     {
         // set the indices to highlight
         _indicesToHighlight = highs ?? [Highlight]()
@@ -473,41 +441,53 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     /// Highlights any y-value at the given x-value in the given DataSet.
     /// Provide -1 as the dataSetIndex to undo all highlighting.
     /// This method will call the delegate.
-    /// - parameter x: The x-value to highlight
-    /// - parameter dataSetIndex: The dataset index to search in
-    open func highlightValue(x: Double, dataSetIndex: Int)
+    ///
+    /// - Parameters:
+    ///   - x: The x-value to highlight
+    ///   - dataSetIndex: The dataset index to search in
+    ///   - dataIndex: The data index to search in (only used in CombinedChartView currently)
+    @objc open func highlightValue(x: Double, dataSetIndex: Int, dataIndex: Int = -1)
     {
-        highlightValue(x: x, dataSetIndex: dataSetIndex, callDelegate: true)
+        highlightValue(x: x, dataSetIndex: dataSetIndex, dataIndex: dataIndex, callDelegate: true)
     }
     
     /// Highlights the value at the given x-value and y-value in the given DataSet.
     /// Provide -1 as the dataSetIndex to undo all highlighting.
     /// This method will call the delegate.
-    /// - parameter x: The x-value to highlight
-    /// - parameter y: The y-value to highlight. Supply `NaN` for "any"
-    /// - parameter dataSetIndex: The dataset index to search in
-    open func highlightValue(x: Double, y: Double, dataSetIndex: Int)
+    ///
+    /// - Parameters:
+    ///   - x: The x-value to highlight
+    ///   - y: The y-value to highlight. Supply `NaN` for "any"
+    ///   - dataSetIndex: The dataset index to search in
+    ///   - dataIndex: The data index to search in (only used in CombinedChartView currently)
+    @objc open func highlightValue(x: Double, y: Double, dataSetIndex: Int, dataIndex: Int = -1)
     {
-        highlightValue(x: x, y: y, dataSetIndex: dataSetIndex, callDelegate: true)
+        highlightValue(x: x, y: y, dataSetIndex: dataSetIndex, dataIndex: dataIndex, callDelegate: true)
     }
     
     /// Highlights any y-value at the given x-value in the given DataSet.
     /// Provide -1 as the dataSetIndex to undo all highlighting.
-    /// - parameter x: The x-value to highlight
-    /// - parameter dataSetIndex: The dataset index to search in
-    /// - parameter callDelegate: Should the delegate be called for this change
-    open func highlightValue(x: Double, dataSetIndex: Int, callDelegate: Bool)
+    ///
+    /// - Parameters:
+    ///   - x: The x-value to highlight
+    ///   - dataSetIndex: The dataset index to search in
+    ///   - dataIndex: The data index to search in (only used in CombinedChartView currently)
+    ///   - callDelegate: Should the delegate be called for this change
+    @objc open func highlightValue(x: Double, dataSetIndex: Int, dataIndex: Int = -1, callDelegate: Bool)
     {
-        highlightValue(x: x, y: Double.nan, dataSetIndex: dataSetIndex, callDelegate: callDelegate)
+        highlightValue(x: x, y: .nan, dataSetIndex: dataSetIndex, dataIndex: dataIndex, callDelegate: callDelegate)
     }
     
     /// Highlights the value at the given x-value and y-value in the given DataSet.
     /// Provide -1 as the dataSetIndex to undo all highlighting.
-    /// - parameter x: The x-value to highlight
-    /// - parameter y: The y-value to highlight. Supply `NaN` for "any"
-    /// - parameter dataSetIndex: The dataset index to search in
-    /// - parameter callDelegate: Should the delegate be called for this change
-    open func highlightValue(x: Double, y: Double, dataSetIndex: Int, callDelegate: Bool)
+    ///
+    /// - Parameters:
+    ///   - x: The x-value to highlight
+    ///   - y: The y-value to highlight. Supply `NaN` for "any"
+    ///   - dataSetIndex: The dataset index to search in
+    ///   - dataIndex: The data index to search in (only used in CombinedChartView currently)
+    ///   - callDelegate: Should the delegate be called for this change
+    @objc open func highlightValue(x: Double, y: Double, dataSetIndex: Int, dataIndex: Int = -1, callDelegate: Bool)
     {
         guard let data = _data else
         {
@@ -521,26 +501,29 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         }
         else
         {
-            highlightValue(Highlight(x: x, y: y, dataSetIndex: dataSetIndex), callDelegate: callDelegate)
+            highlightValue(Highlight(x: x, y: y, dataSetIndex: dataSetIndex, dataIndex: dataIndex), callDelegate: callDelegate)
         }
     }
     
     /// Highlights the values represented by the provided Highlight object
     /// This method *will not* call the delegate.
-    /// - parameter highlight: contains information about which entry should be highlighted
-    open func highlightValue(_ highlight: Highlight?)
+    ///
+    /// - Parameters:
+    ///   - highlight: contains information about which entry should be highlighted
+    @objc open func highlightValue(_ highlight: Highlight?)
     {
         highlightValue(highlight, callDelegate: false)
     }
 
     /// Highlights the value selected by touch gesture.
-    open func highlightValue(_ highlight: Highlight?, callDelegate: Bool)
+    @objc open func highlightValue(_ highlight: Highlight?, callDelegate: Bool)
     {
         var entry: ChartDataEntry?
         var h = highlight
         
         if h == nil
         {
+            self.lastHighlighted = nil
             _indicesToHighlight.removeAll(keepingCapacity: false)
         }
         else
@@ -558,16 +541,16 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
             }
         }
         
-        if callDelegate && delegate != nil
+        if callDelegate, let delegate = delegate
         {
-            if h == nil
+            if let h = h
             {
-                delegate!.chartValueNothingSelected?(self)
+                // notify the listener
+                delegate.chartValueSelected?(self, entry: entry!, highlight: h)
             }
             else
             {
-                // notify the listener
-                delegate!.chartValueSelected?(self, entry: entry!, highlight: h!)
+                delegate.chartValueNothingSelected?(self)
             }
         }
         
@@ -575,10 +558,10 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         setNeedsDisplay()
     }
     
-    /// - returns: The Highlight object (contains x-index and DataSet index) of the
+    /// - Returns: The Highlight object (contains x-index and DataSet index) of the
     /// selected value at the given touch point inside the Line-, Scatter-, or
     /// CandleStick-Chart.
-    open func getHighlightByTouchPoint(_ pt: CGPoint) -> Highlight?
+    @objc open func getHighlightByTouchPoint(_ pt: CGPoint) -> Highlight?
     {
         if _data === nil
         {
@@ -590,7 +573,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     }
 
     /// The last value that was highlighted via touch.
-    open var lastHighlighted: Highlight?
+    @objc open var lastHighlighted: Highlight?
   
     // MARK: - Markers
 
@@ -635,132 +618,154 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         }
     }
     
-    /// - returns: The actual position in pixels of the MarkerView for the given Entry in the given DataSet.
-    open func getMarkerPosition(highlight: Highlight) -> CGPoint
+    /// - Returns: The actual position in pixels of the MarkerView for the given Entry in the given DataSet.
+    @objc open func getMarkerPosition(highlight: Highlight) -> CGPoint
     {
         return CGPoint(x: highlight.drawX, y: highlight.drawY)
     }
     
     // MARK: - Animation
     
-    /// - returns: The animator responsible for animating chart values.
-    open var chartAnimator: Animator!
+    /// The animator responsible for animating chart values.
+    @objc open var chartAnimator: Animator!
     {
         return _animator
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingX: an easing function for the animation on the x axis
-    /// - parameter easingY: an easing function for the animation on the y axis
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingX: ChartEasingFunctionBlock?, easingY: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingX: an easing function for the animation on the x axis
+    ///   - easingY: an easing function for the animation on the y axis
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingX: ChartEasingFunctionBlock?, easingY: ChartEasingFunctionBlock?)
     {
         _animator.animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easingX: easingX, easingY: easingY)
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingOptionX: the easing function for the animation on the x axis
-    /// - parameter easingOptionY: the easing function for the animation on the y axis
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOptionX: ChartEasingOption, easingOptionY: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingOptionX: the easing function for the animation on the x axis
+    ///   - easingOptionY: the easing function for the animation on the y axis
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOptionX: ChartEasingOption, easingOptionY: ChartEasingOption)
     {
         _animator.animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easingOptionX: easingOptionX, easingOptionY: easingOptionY)
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easing: an easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easing: an easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
     {
         _animator.animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easing: easing)
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingOption: the easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOption: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingOption: the easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval, easingOption: ChartEasingOption)
     {
         _animator.animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration, easingOption: easingOption)
     }
     
     /// Animates the drawing / rendering of the chart on both x- and y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter yAxisDuration: duration for animating the y axis
-    open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - yAxisDuration: duration for animating the y axis
+    @objc open func animate(xAxisDuration: TimeInterval, yAxisDuration: TimeInterval)
     {
         _animator.animate(xAxisDuration: xAxisDuration, yAxisDuration: yAxisDuration)
     }
     
     /// Animates the drawing / rendering of the chart the x-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter easing: an easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - easing: an easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
     {
         _animator.animate(xAxisDuration: xAxisDuration, easing: easing)
     }
     
     /// Animates the drawing / rendering of the chart the x-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    /// - parameter easingOption: the easing function for the animation
-    open func animate(xAxisDuration: TimeInterval, easingOption: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    ///   - easingOption: the easing function for the animation
+    @objc open func animate(xAxisDuration: TimeInterval, easingOption: ChartEasingOption)
     {
         _animator.animate(xAxisDuration: xAxisDuration, easingOption: easingOption)
     }
     
     /// Animates the drawing / rendering of the chart the x-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter xAxisDuration: duration for animating the x axis
-    open func animate(xAxisDuration: TimeInterval)
+    ///
+    /// - Parameters:
+    ///   - xAxisDuration: duration for animating the x axis
+    @objc open func animate(xAxisDuration: TimeInterval)
     {
         _animator.animate(xAxisDuration: xAxisDuration)
     }
     
     /// Animates the drawing / rendering of the chart the y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easing: an easing function for the animation
-    open func animate(yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
+    ///
+    /// - Parameters:
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easing: an easing function for the animation
+    @objc open func animate(yAxisDuration: TimeInterval, easing: ChartEasingFunctionBlock?)
     {
         _animator.animate(yAxisDuration: yAxisDuration, easing: easing)
     }
     
     /// Animates the drawing / rendering of the chart the y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter yAxisDuration: duration for animating the y axis
-    /// - parameter easingOption: the easing function for the animation
-    open func animate(yAxisDuration: TimeInterval, easingOption: ChartEasingOption)
+    ///
+    /// - Parameters:
+    ///   - yAxisDuration: duration for animating the y axis
+    ///   - easingOption: the easing function for the animation
+    @objc open func animate(yAxisDuration: TimeInterval, easingOption: ChartEasingOption)
     {
         _animator.animate(yAxisDuration: yAxisDuration, easingOption: easingOption)
     }
     
     /// Animates the drawing / rendering of the chart the y-axis with the specified animation time.
     /// If `animate(...)` is called, no further calling of `invalidate()` is necessary to refresh the chart.
-    /// - parameter yAxisDuration: duration for animating the y axis
-    open func animate(yAxisDuration: TimeInterval)
+    ///
+    /// - Parameters:
+    ///   - yAxisDuration: duration for animating the y axis
+    @objc open func animate(yAxisDuration: TimeInterval)
     {
         _animator.animate(yAxisDuration: yAxisDuration)
     }
     
     // MARK: - Accessors
 
-    /// - returns: The current y-max value across all DataSets
+    /// The current y-max value across all DataSets
     open var chartYMax: Double
     {
         return _data?.yMax ?? 0.0
     }
 
-    /// - returns: The current y-min value across all DataSets
+    /// The current y-min value across all DataSets
     open var chartYMin: Double
     {
         return _data?.yMin ?? 0.0
@@ -781,48 +786,47 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         return _xAxis.axisRange
     }
     
-    /// *
-    /// - note: (Equivalent of getCenter() in MPAndroidChart, as center is already a standard in iOS that returns the center point relative to superview, and MPAndroidChart returns relative to self)*
-    /// - returns: The center point of the chart (the whole View) in pixels.
-    open var midPoint: CGPoint
+    /// - Note: (Equivalent of getCenter() in MPAndroidChart, as center is already a standard in iOS that returns the center point relative to superview, and MPAndroidChart returns relative to self)*
+    /// The center point of the chart (the whole View) in pixels.
+    @objc open var midPoint: CGPoint
     {
         let bounds = self.bounds
         return CGPoint(x: bounds.origin.x + bounds.size.width / 2.0, y: bounds.origin.y + bounds.size.height / 2.0)
     }
     
-    /// - returns: The center of the chart taking offsets under consideration. (returns the center of the content rectangle)
+    /// The center of the chart taking offsets under consideration. (returns the center of the content rectangle)
     open var centerOffsets: CGPoint
     {
         return _viewPortHandler.contentCenter
     }
     
-    /// - returns: The Legend object of the chart. This method can be used to get an instance of the legend in order to customize the automatically generated Legend.
-    open var legend: Legend
+    /// The Legend object of the chart. This method can be used to get an instance of the legend in order to customize the automatically generated Legend.
+    @objc open var legend: Legend
     {
         return _legend
     }
     
-    /// - returns: The renderer object responsible for rendering / drawing the Legend.
-    open var legendRenderer: LegendRenderer!
+    /// The renderer object responsible for rendering / drawing the Legend.
+    @objc open var legendRenderer: LegendRenderer!
     {
         return _legendRenderer
     }
     
-    /// - returns: The rectangle that defines the borders of the chart-value surface (into which the actual values are drawn).
-    open var contentRect: CGRect
+    /// The rectangle that defines the borders of the chart-value surface (into which the actual values are drawn).
+    @objc open var contentRect: CGRect
     {
         return _viewPortHandler.contentRect
     }
     
-    /// - returns: The ViewPortHandler of the chart that is responsible for the
+    /// - Returns: The ViewPortHandler of the chart that is responsible for the
     /// content area of the chart and its offsets and dimensions.
-    open var viewPortHandler: ViewPortHandler!
+    @objc open var viewPortHandler: ViewPortHandler!
     {
         return _viewPortHandler
     }
     
-    /// - returns: The bitmap that represents the chart.
-    open func getChartImage(transparent: Bool) -> NSUIImage?
+    /// - Returns: The bitmap that represents the chart.
+    @objc open func getChartImage(transparent: Bool) -> NSUIImage?
     {
         NSUIGraphicsBeginImageContextWithOptions(bounds.size, isOpaque || !transparent, NSUIMainScreen()?.nsuiScale ?? 1.0)
         
@@ -864,38 +868,34 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     /// the SD card chart is saved as a PNG image, example:
     /// saveToPath("myfilename", "foldername1/foldername2")
     ///
-    /// - parameter to: path to the image to save
-    /// - parameter format: the format to save
-    /// - parameter compressionQuality: compression quality for lossless formats (JPEG)
-    ///
-    /// - returns: `true` if the image was saved successfully
+    /// - Parameters:
+    ///   - to: path to the image to save
+    ///   - format: the format to save
+    ///   - compressionQuality: compression quality for lossless formats (JPEG)
+    /// - Returns: `true` if the image was saved successfully
     open func save(to path: String, format: ImageFormat, compressionQuality: Double) -> Bool
     {
-		guard let image = getChartImage(transparent: format != .jpeg)
-            else { return false }
+        guard let image = getChartImage(transparent: format != .jpeg) else { return false }
         
-        var imageData: Data!
+        let imageData: Data?
         switch (format)
         {
-        case .png:
-            imageData = NSUIImagePNGRepresentation(image)
-            break
-            
-        case .jpeg:
-            imageData = NSUIImageJPEGRepresentation(image, CGFloat(compressionQuality))
-            break
+        case .png: imageData = NSUIImagePNGRepresentation(image)
+        case .jpeg: imageData = NSUIImageJPEGRepresentation(image, CGFloat(compressionQuality))
         }
         
+        guard let data = imageData else { return false }
+        
         do
         {
-            try imageData.write(to: URL(fileURLWithPath: path), options: .atomic)
+            try data.write(to: URL(fileURLWithPath: path), options: .atomic)
         }
         catch
         {
             return false
         }
         
-		return true
+        return true
     }
     
     internal var _viewportJobs = [ViewPortJob]()
@@ -926,20 +926,20 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
         }
     }
     
-    open func removeViewportJob(_ job: ViewPortJob)
+    @objc open func removeViewportJob(_ job: ViewPortJob)
     {
-        if let index = _viewportJobs.index(where: { $0 === job })
+        if let index = _viewportJobs.firstIndex(where: { $0 === job })
         {
             _viewportJobs.remove(at: index)
         }
     }
     
-    open func clearAllViewportJobs()
+    @objc open func clearAllViewportJobs()
     {
         _viewportJobs.removeAll(keepingCapacity: false)
     }
     
-    open func addViewportJob(_ job: ViewPortJob)
+    @objc open func addViewportJob(_ job: ViewPortJob)
     {
         if _viewPortHandler.hasChartDimens
         {
@@ -952,8 +952,8 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     }
     
     /// **default**: true
-    /// - returns: `true` if chart continues to scroll after touch up, `false` ifnot.
-    open var isDragDecelerationEnabled: Bool
+    /// `true` if chart continues to scroll after touch up, `false` ifnot.
+    @objc open var isDragDecelerationEnabled: Bool
         {
             return dragDecelerationEnabled
     }
@@ -962,7 +962,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     /// 1 is an invalid value, and will be converted to 0.999 automatically.
     /// 
     /// **default**: true
-    open var dragDecelerationFrictionCoef: CGFloat
+    @objc open var dragDecelerationFrictionCoef: CGFloat
     {
         get
         {
@@ -1003,7 +1003,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
     
     open func animatorStopped(_ chartAnimator: Animator)
     {
-        
+        delegate?.chartView?(self, animatorDidStop: chartAnimator)
     }
     
     // MARK: - Touches
diff --git a/Source/Charts/Charts/CombinedChartView.swift b/Source/Charts/Charts/CombinedChartView.swift
index 0fce9e8d94..47eebd6c78 100644
--- a/Source/Charts/Charts/CombinedChartView.swift
+++ b/Source/Charts/Charts/CombinedChartView.swift
@@ -55,12 +55,12 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
             
             self.highlighter = CombinedHighlighter(chart: self, barDataProvider: self)
             
-            (renderer as! CombinedChartRenderer?)!.createRenderers()
+            (renderer as? CombinedChartRenderer)?.createRenderers()
             renderer?.initBuffers()
         }
     }
     
-    open var fillFormatter: IFillFormatter
+    @objc open var fillFormatter: IFillFormatter
     {
         get
         {
@@ -76,7 +76,7 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
         }
     }
     
-    /// - returns: The Highlight object (contains x-index and DataSet index) of the selected value at the given touch point inside the CombinedChart.
+    /// - Returns: The Highlight object (contains x-index and DataSet index) of the selected value at the given touch point inside the CombinedChart.
     open override func getHighlightByTouchPoint(_ pt: CGPoint) -> Highlight?
     {
         if _data === nil
@@ -116,11 +116,7 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
     {
         get
         {
-            if _data === nil
-            {
-                return nil
-            }
-            return (_data as! CombinedChartData!).lineData
+            return combinedData?.lineData
         }
     }
     
@@ -130,11 +126,7 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
     {
         get
         {
-            if _data === nil
-            {
-                return nil
-            }
-            return (_data as! CombinedChartData!).barData
+            return combinedData?.barData
         }
     }
     
@@ -144,11 +136,7 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
     {
         get
         {
-            if _data === nil
-            {
-                return nil
-            }
-            return (_data as! CombinedChartData!).scatterData
+            return combinedData?.scatterData
         }
     }
     
@@ -158,11 +146,7 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
     {
         get
         {
-            if _data === nil
-            {
-                return nil
-            }
-            return (_data as! CombinedChartData!).candleData
+            return combinedData?.candleData
         }
     }
     
@@ -172,54 +156,91 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
     {
         get
         {
-            if _data === nil
-            {
-                return nil
-            }
-            return (_data as! CombinedChartData!).bubbleData
+            return combinedData?.bubbleData
         }
     }
     
     // MARK: - Accessors
     
     /// if set to true, all values are drawn above their bars, instead of below their top
-    open var drawValueAboveBarEnabled: Bool
+    @objc open var drawValueAboveBarEnabled: Bool
         {
-        get { return (renderer as! CombinedChartRenderer!).drawValueAboveBarEnabled }
-        set { (renderer as! CombinedChartRenderer!).drawValueAboveBarEnabled = newValue }
+        get { return (renderer as! CombinedChartRenderer).drawValueAboveBarEnabled }
+        set { (renderer as! CombinedChartRenderer).drawValueAboveBarEnabled = newValue }
     }
     
     /// if set to true, a grey area is drawn behind each bar that indicates the maximum value
-    open var drawBarShadowEnabled: Bool
+    @objc open var drawBarShadowEnabled: Bool
     {
-        get { return (renderer as! CombinedChartRenderer!).drawBarShadowEnabled }
-        set { (renderer as! CombinedChartRenderer!).drawBarShadowEnabled = newValue }
+        get { return (renderer as! CombinedChartRenderer).drawBarShadowEnabled }
+        set { (renderer as! CombinedChartRenderer).drawBarShadowEnabled = newValue }
     }
     
-    /// - returns: `true` if drawing values above bars is enabled, `false` ifnot
-    open var isDrawValueAboveBarEnabled: Bool { return (renderer as! CombinedChartRenderer!).drawValueAboveBarEnabled }
+    /// `true` if drawing values above bars is enabled, `false` ifnot
+    open var isDrawValueAboveBarEnabled: Bool { return (renderer as! CombinedChartRenderer).drawValueAboveBarEnabled }
     
-    /// - returns: `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot
-    open var isDrawBarShadowEnabled: Bool { return (renderer as! CombinedChartRenderer!).drawBarShadowEnabled }
+    /// `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot
+    open var isDrawBarShadowEnabled: Bool { return (renderer as! CombinedChartRenderer).drawBarShadowEnabled }
     
     /// the order in which the provided data objects should be drawn.
     /// The earlier you place them in the provided array, the further they will be in the background. 
     /// e.g. if you provide [DrawOrder.Bar, DrawOrder.Line], the bars will be drawn behind the lines.
-    open var drawOrder: [Int]
+    @objc open var drawOrder: [Int]
     {
         get
         {
-            return (renderer as! CombinedChartRenderer!).drawOrder.map { $0.rawValue }
+            return (renderer as! CombinedChartRenderer).drawOrder.map { $0.rawValue }
         }
         set
         {
-            (renderer as! CombinedChartRenderer!).drawOrder = newValue.map { DrawOrder(rawValue: $0)! }
+            (renderer as! CombinedChartRenderer).drawOrder = newValue.map { DrawOrder(rawValue: $0)! }
         }
     }
     
     /// Set this to `true` to make the highlight operation full-bar oriented, `false` to make it highlight single values
-    open var highlightFullBarEnabled: Bool = false
+    @objc open var highlightFullBarEnabled: Bool = false
     
-    /// - returns: `true` the highlight is be full-bar oriented, `false` ifsingle-value
+    /// `true` the highlight is be full-bar oriented, `false` ifsingle-value
     open var isHighlightFullBarEnabled: Bool { return highlightFullBarEnabled }
+    
+    // MARK: - ChartViewBase
+    
+    /// draws all MarkerViews on the highlighted positions
+    override func drawMarkers(context: CGContext)
+    {
+        guard
+            let marker = marker, 
+            isDrawMarkersEnabled && valuesToHighlight()
+            else { return }
+        
+        for i in 0 ..< _indicesToHighlight.count
+        {
+            let highlight = _indicesToHighlight[i]
+            
+            guard 
+                let set = combinedData?.getDataSetByHighlight(highlight),
+                let e = _data?.entryForHighlight(highlight)
+                else { continue }
+            
+            let entryIndex = set.entryIndex(entry: e)
+            if entryIndex > Int(Double(set.entryCount) * _animator.phaseX)
+            {
+                continue
+            }
+            
+            let pos = getMarkerPosition(highlight: highlight)
+            
+            // check bounds
+            if !_viewPortHandler.isInBounds(x: pos.x, y: pos.y)
+            {
+                continue
+            }
+            
+            // callbacks to update the content
+            marker.refreshContent(entry: e, highlight: highlight)
+            
+            // draw the marker
+            marker.draw(context: context, point: pos)
+        }
+    }
 }
diff --git a/Source/Charts/Charts/HorizontalBarChartView.swift b/Source/Charts/Charts/HorizontalBarChartView.swift
index 06863ee619..7b6163c8c9 100644
--- a/Source/Charts/Charts/HorizontalBarChartView.swift
+++ b/Source/Charts/Charts/HorizontalBarChartView.swift
@@ -12,10 +12,6 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 /// BarChart with horizontal bar orientation. In this implementation, x- and y-axis are switched.
 open class HorizontalBarChartView: BarChartView
 {
@@ -27,13 +23,74 @@ open class HorizontalBarChartView: BarChartView
         _rightAxisTransformer = TransformerHorizontalBarChart(viewPortHandler: _viewPortHandler)
         
         renderer = HorizontalBarChartRenderer(dataProvider: self, animator: _animator, viewPortHandler: _viewPortHandler)
-        _leftYAxisRenderer = YAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, yAxis: _leftAxis, transformer: _leftAxisTransformer)
-        _rightYAxisRenderer = YAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, yAxis: _rightAxis, transformer: _rightAxisTransformer)
-        _xAxisRenderer = XAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, xAxis: _xAxis, transformer: _leftAxisTransformer, chart: self)
+        leftYAxisRenderer = YAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, yAxis: leftAxis, transformer: _leftAxisTransformer)
+        rightYAxisRenderer = YAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, yAxis: rightAxis, transformer: _rightAxisTransformer)
+        xAxisRenderer = XAxisRendererHorizontalBarChart(viewPortHandler: _viewPortHandler, xAxis: _xAxis, transformer: _leftAxisTransformer, chart: self)
         
         self.highlighter = HorizontalBarHighlighter(chart: self)
     }
     
+    internal override func calculateLegendOffsets(offsetLeft: inout CGFloat, offsetTop: inout CGFloat, offsetRight: inout CGFloat, offsetBottom: inout CGFloat)
+    {
+        guard
+            let legend = _legend,
+            legend.isEnabled,
+            !legend.drawInside
+        else { return }
+        
+        // setup offsets for legend
+        switch legend.orientation
+        {
+        case .vertical:
+            switch legend.horizontalAlignment
+            {
+            case .left:
+                offsetLeft += min(legend.neededWidth, _viewPortHandler.chartWidth * legend.maxSizePercent) + legend.xOffset
+                
+            case .right:
+                offsetRight += min(legend.neededWidth, _viewPortHandler.chartWidth * legend.maxSizePercent) + legend.xOffset
+                
+            case .center:
+                
+                switch legend.verticalAlignment
+                {
+                case .top:
+                    offsetTop += min(legend.neededHeight, _viewPortHandler.chartHeight * legend.maxSizePercent) + legend.yOffset
+                    
+                case .bottom:
+                    offsetBottom += min(legend.neededHeight, _viewPortHandler.chartHeight * legend.maxSizePercent) + legend.yOffset
+                    
+                default:
+                    break
+                }
+            }
+            
+        case .horizontal:
+            switch legend.verticalAlignment
+            {
+            case .top:
+                offsetTop += min(legend.neededHeight, _viewPortHandler.chartHeight * legend.maxSizePercent) + legend.yOffset
+                
+                // left axis equals the top x-axis in a horizontal chart
+                if leftAxis.isEnabled && leftAxis.isDrawLabelsEnabled
+                {
+                    offsetTop += leftAxis.getRequiredHeightSpace()
+                }
+                
+            case .bottom:
+                offsetBottom += min(legend.neededHeight, _viewPortHandler.chartHeight * legend.maxSizePercent) + legend.yOffset
+
+                // right axis equals the bottom x-axis in a horizontal chart
+                if rightAxis.isEnabled && rightAxis.isDrawLabelsEnabled
+                {
+                    offsetBottom += rightAxis.getRequiredHeightSpace()
+                }
+            default:
+                break
+            }
+        }
+    }
+    
     internal override func calculateOffsets()
     {
         var offsetLeft: CGFloat = 0.0,
@@ -47,14 +104,14 @@ open class HorizontalBarChartView: BarChartView
                                offsetBottom: &offsetBottom)
         
         // offsets for y-labels
-        if _leftAxis.needsOffset
+        if leftAxis.needsOffset
         {
-            offsetTop += _leftAxis.getRequiredHeightSpace()
+            offsetTop += leftAxis.getRequiredHeightSpace()
         }
         
-        if _rightAxis.needsOffset
+        if rightAxis.needsOffset
         {
-            offsetBottom += _rightAxis.getRequiredHeightSpace()
+            offsetBottom += rightAxis.getRequiredHeightSpace()
         }
         
         let xlabelwidth = _xAxis.labelRotatedWidth
@@ -81,7 +138,7 @@ open class HorizontalBarChartView: BarChartView
         offsetRight += self.extraRightOffset
         offsetBottom += self.extraBottomOffset
         offsetLeft += self.extraLeftOffset
-        
+
         _viewPortHandler.restrainViewPort(
             offsetLeft: max(self.minOffset, offsetLeft),
             offsetTop: max(self.minOffset, offsetTop),
@@ -94,8 +151,8 @@ open class HorizontalBarChartView: BarChartView
     
     internal override func prepareValuePxMatrix()
     {
-        _rightAxisTransformer.prepareMatrixValuePx(chartXMin: _rightAxis._axisMinimum, deltaX: CGFloat(_rightAxis.axisRange), deltaY: CGFloat(_xAxis.axisRange), chartYMin: _xAxis._axisMinimum)
-        _leftAxisTransformer.prepareMatrixValuePx(chartXMin: _leftAxis._axisMinimum, deltaX: CGFloat(_leftAxis.axisRange), deltaY: CGFloat(_xAxis.axisRange), chartYMin: _xAxis._axisMinimum)
+        _rightAxisTransformer.prepareMatrixValuePx(chartXMin: rightAxis._axisMinimum, deltaX: CGFloat(rightAxis.axisRange), deltaY: CGFloat(_xAxis.axisRange), chartYMin: _xAxis._axisMinimum)
+        _leftAxisTransformer.prepareMatrixValuePx(chartXMin: leftAxis._axisMinimum, deltaX: CGFloat(leftAxis.axisRange), deltaY: CGFloat(_xAxis.axisRange), chartYMin: _xAxis._axisMinimum)
     }
     
     open override func getMarkerPosition(highlight: Highlight) -> CGPoint
@@ -147,7 +204,7 @@ open class HorizontalBarChartView: BarChartView
         return self.highlighter?.getHighlight(x: pt.y, y: pt.x)
     }
     
-    /// - returns: The lowest x-index (value on the x-axis) that is still visible on he chart.
+    /// The lowest x-index (value on the x-axis) that is still visible on he chart.
     open override var lowestVisibleX: Double
     {
         var pt = CGPoint(
@@ -159,7 +216,7 @@ open class HorizontalBarChartView: BarChartView
         return max(xAxis._axisMinimum, Double(pt.y))
     }
     
-    /// - returns: The highest x-index (value on the x-axis) that is still visible on the chart.
+    /// The highest x-index (value on the x-axis) that is still visible on the chart.
     open override var highestVisibleX: Double
     {
         var pt = CGPoint(
diff --git a/Source/Charts/Charts/PieChartView.swift b/Source/Charts/Charts/PieChartView.swift
old mode 100755
new mode 100644
index cf8fbc96e1..bb95c1ff85
--- a/Source/Charts/Charts/PieChartView.swift
+++ b/Source/Charts/Charts/PieChartView.swift
@@ -12,65 +12,69 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 /// View that represents a pie chart. Draws cake like slices.
 open class PieChartView: PieRadarChartViewBase
 {
     /// rect object that represents the bounds of the piechart, needed for drawing the circle
-    fileprivate var _circleBox = CGRect()
+    private var _circleBox = CGRect()
     
     /// flag indicating if entry labels should be drawn or not
-    fileprivate var _drawEntryLabelsEnabled = true
+    private var _drawEntryLabelsEnabled = true
     
     /// array that holds the width of each pie-slice in degrees
-    fileprivate var _drawAngles = [CGFloat]()
+    private var _drawAngles = [CGFloat]()
     
     /// array that holds the absolute angle in degrees of each slice
-    fileprivate var _absoluteAngles = [CGFloat]()
+    private var _absoluteAngles = [CGFloat]()
     
     /// if true, the hole inside the chart will be drawn
-    fileprivate var _drawHoleEnabled = true
+    private var _drawHoleEnabled = true
     
-    fileprivate var _holeColor: NSUIColor? = NSUIColor.white
+    private var _holeColor: NSUIColor? = NSUIColor.white
     
     /// Sets the color the entry labels are drawn with.
-    fileprivate var _entryLabelColor: NSUIColor? = NSUIColor.white
+    private var _entryLabelColor: NSUIColor? = NSUIColor.white
     
     /// Sets the font the entry labels are drawn with.
-    fileprivate var _entryLabelFont: NSUIFont? = NSUIFont(name: "HelveticaNeue", size: 13.0)
+    private var _entryLabelFont: NSUIFont? = NSUIFont(name: "HelveticaNeue", size: 13.0)
     
     /// if true, the hole will see-through to the inner tips of the slices
-    fileprivate var _drawSlicesUnderHoleEnabled = false
+    private var _drawSlicesUnderHoleEnabled = false
     
     /// if true, the values inside the piechart are drawn as percent values
-    fileprivate var _usePercentValuesEnabled = false
+    private var _usePercentValuesEnabled = false
     
     /// variable for the text that is drawn in the center of the pie-chart
-    fileprivate var _centerAttributedText: NSAttributedString?
+    private var _centerAttributedText: NSAttributedString?
     
     /// the offset on the x- and y-axis the center text has in dp.
-    fileprivate var _centerTextOffset: CGPoint = CGPoint()
+    private var _centerTextOffset: CGPoint = CGPoint()
     
     /// indicates the size of the hole in the center of the piechart
     ///
     /// **default**: `0.5`
-    fileprivate var _holeRadiusPercent = CGFloat(0.5)
+    private var _holeRadiusPercent = CGFloat(0.5)
     
-    fileprivate var _transparentCircleColor: NSUIColor? = NSUIColor(white: 1.0, alpha: 105.0/255.0)
+    private var _transparentCircleColor: NSUIColor? = NSUIColor(white: 1.0, alpha: 105.0/255.0)
     
     /// the radius of the transparent circle next to the chart-hole in the center
-    fileprivate var _transparentCircleRadiusPercent = CGFloat(0.55)
+    private var _transparentCircleRadiusPercent = CGFloat(0.55)
     
     /// if enabled, centertext is drawn
-    fileprivate var _drawCenterTextEnabled = true
+    private var _drawCenterTextEnabled = true
     
-    fileprivate var _centerTextRadiusPercent: CGFloat = 1.0
+    private var _centerTextRadiusPercent: CGFloat = 1.0
     
     /// maximum angle for this pie
-    fileprivate var _maxAngle: CGFloat = 360.0
+    private var _maxAngle: CGFloat = 360.0
 
     public override init(frame: CGRect)
     {
@@ -102,20 +106,23 @@ open class PieChartView: PieRadarChartViewBase
         }
         
         let optionalContext = NSUIGraphicsGetCurrentContext()
-        guard let context = optionalContext else { return }
+        guard let context = optionalContext, let renderer = renderer else
+        {
+            return
+        }
         
-        renderer!.drawData(context: context)
+        renderer.drawData(context: context)
         
         if (valuesToHighlight())
         {
-            renderer!.drawHighlighted(context: context, indices: _indicesToHighlight)
+            renderer.drawHighlighted(context: context, indices: _indicesToHighlight)
         }
         
-        renderer!.drawExtras(context: context)
+        renderer.drawExtras(context: context)
         
-        renderer!.drawValues(context: context)
+        renderer.drawValues(context: context)
         
-        _legendRenderer.renderLegend(context: context)
+        legendRenderer.renderLegend(context: context)
         
         drawDescription(context: context)
         
@@ -172,14 +179,14 @@ open class PieChartView: PieRadarChartViewBase
         let offset = drawAngles[entryIndex] / 2.0
         
         // calculate the text position
-        let x: CGFloat = (r * cos(((rotationAngle + absoluteAngles[entryIndex] - offset) * CGFloat(_animator.phaseY)) * ChartUtils.Math.FDEG2RAD) + center.x)
-        let y: CGFloat = (r * sin(((rotationAngle + absoluteAngles[entryIndex] - offset) * CGFloat(_animator.phaseY)) * ChartUtils.Math.FDEG2RAD) + center.y)
+        let x: CGFloat = (r * cos(((rotationAngle + absoluteAngles[entryIndex] - offset) * CGFloat(_animator.phaseY)).DEG2RAD) + center.x)
+        let y: CGFloat = (r * sin(((rotationAngle + absoluteAngles[entryIndex] - offset) * CGFloat(_animator.phaseY)).DEG2RAD) + center.y)
         
         return CGPoint(x: x, y: y)
     }
     
     /// calculates the needed angles for the chart slices
-    fileprivate func calcAngles()
+    private func calcAngles()
     {
         _drawAngles = [CGFloat]()
         _absoluteAngles = [CGFloat]()
@@ -192,17 +199,12 @@ open class PieChartView: PieRadarChartViewBase
         _absoluteAngles.reserveCapacity(entryCount)
         
         let yValueSum = (_data as! PieChartData).yValueSum
-        
-        var dataSets = data.dataSets
 
         var cnt = 0
 
-        for i in 0 ..< data.dataSetCount
+        for set in data.dataSets
         {
-            let set = dataSets[i]
-            let entryCount = set.entryCount
-
-            for j in 0 ..< entryCount
+            for j in 0 ..< set.entryCount
             {
                 guard let e = set.entryForIndex(j) else { continue }
                 
@@ -223,34 +225,19 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// Checks if the given index is set to be highlighted.
-    open func needsHighlight(index: Int) -> Bool
+    @objc open func needsHighlight(index: Int) -> Bool
     {
-        // no highlight
-        if !valuesToHighlight()
-        {
-            return false
-        }
-        
-        for i in 0 ..< _indicesToHighlight.count
-        {
-            // check if the xvalue for the given dataset needs highlight
-            if Int(_indicesToHighlight[i].x) == index
-            {
-                return true
-            }
-        }
-        
-        return false
+        return _indicesToHighlight.contains { Int($0.x) == index }
     }
     
     /// calculates the needed angle for a given value
-    fileprivate func calcAngle(_ value: Double) -> CGFloat
+    private func calcAngle(_ value: Double) -> CGFloat
     {
         return calcAngle(value: value, yValueSum: (_data as! PieChartData).yValueSum)
     }
     
     /// calculates the needed angle for a given value
-    fileprivate func calcAngle(value: Double, yValueSum: Double) -> CGFloat
+    private func calcAngle(value: Double, yValueSum: Double) -> CGFloat
     {
         return CGFloat(value) / CGFloat(yValueSum) * _maxAngle
     }
@@ -260,57 +247,43 @@ open class PieChartView: PieRadarChartViewBase
     {
         fatalError("PieChart has no XAxis")
     }
-    
+
     open override func indexForAngle(_ angle: CGFloat) -> Int
     {
+        // TODO: Return nil instead of -1
         // take the current angle of the chart into consideration
-        let a = ChartUtils.normalizedAngleFromAngle(angle - self.rotationAngle)
-        for i in 0 ..< _absoluteAngles.count
-        {
-            if _absoluteAngles[i] > a
-            {
-                return i
-            }
-        }
-        
-        return -1 // return -1 if no index found
+        let a = (angle - self.rotationAngle).normalizedAngle
+        return _absoluteAngles.firstIndex { $0 > a } ?? -1
     }
     
-    /// - returns: The index of the DataSet this x-index belongs to.
-    open func dataSetIndexForIndex(_ xValue: Double) -> Int
+    /// - Returns: The index of the DataSet this x-index belongs to.
+    @objc open func dataSetIndexForIndex(_ xValue: Double) -> Int
     {
-        var dataSets = _data?.dataSets ?? []
-        
-        for i in 0 ..< dataSets.count
-        {
-            if (dataSets[i].entryForXValue(xValue, closestToY: Double.nan) !== nil)
-            {
-                return i
-            }
-        }
-        
-        return -1
+        // TODO: Return nil instead of -1
+        return _data?.dataSets.firstIndex {
+            $0.entryForXValue(xValue, closestToY: .nan) != nil
+        } ?? -1
     }
     
-    /// - returns: An integer array of all the different angles the chart slices
+    /// - Returns: An integer array of all the different angles the chart slices
     /// have the angles in the returned array determine how much space (of 360°)
     /// each slice takes
-    open var drawAngles: [CGFloat]
+    @objc open var drawAngles: [CGFloat]
     {
         return _drawAngles
     }
 
-    /// - returns: The absolute angles of the different chart slices (where the
+    /// - Returns: The absolute angles of the different chart slices (where the
     /// slices end)
-    open var absoluteAngles: [CGFloat]
+    @objc open var absoluteAngles: [CGFloat]
     {
         return _absoluteAngles
     }
     
     /// The color for the hole that is drawn in the center of the PieChart (if enabled).
     /// 
-    /// - note: Use holeTransparent with holeColor = nil to make the hole transparent.*
-    open var holeColor: NSUIColor?
+    /// - Note: Use holeTransparent with holeColor = nil to make the hole transparent.*
+    @objc open var holeColor: NSUIColor?
     {
         get
         {
@@ -326,7 +299,7 @@ open class PieChartView: PieRadarChartViewBase
     /// if true, the hole will see-through to the inner tips of the slices
     ///
     /// **default**: `false`
-    open var drawSlicesUnderHoleEnabled: Bool
+    @objc open var drawSlicesUnderHoleEnabled: Bool
     {
         get
         {
@@ -339,14 +312,14 @@ open class PieChartView: PieRadarChartViewBase
         }
     }
     
-    /// - returns: `true` if the inner tips of the slices are visible behind the hole, `false` if not.
-    open var isDrawSlicesUnderHoleEnabled: Bool
+    /// `true` if the inner tips of the slices are visible behind the hole, `false` if not.
+    @objc open var isDrawSlicesUnderHoleEnabled: Bool
     {
         return drawSlicesUnderHoleEnabled
     }
     
     /// `true` if the hole in the center of the pie-chart is set to be visible, `false` ifnot
-    open var drawHoleEnabled: Bool
+    @objc open var drawHoleEnabled: Bool
     {
         get
         {
@@ -359,8 +332,8 @@ open class PieChartView: PieRadarChartViewBase
         }
     }
     
-    /// - returns: `true` if the hole in the center of the pie-chart is set to be visible, `false` ifnot
-    open var isDrawHoleEnabled: Bool
+    /// `true` if the hole in the center of the pie-chart is set to be visible, `false` ifnot
+    @objc open var isDrawHoleEnabled: Bool
     {
         get
         {
@@ -369,7 +342,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// the text that is displayed in the center of the pie-chart
-    open var centerText: String?
+    @objc open var centerText: String?
     {
         get
         {
@@ -384,19 +357,15 @@ open class PieChartView: PieRadarChartViewBase
             }
             else
             {
-                #if os(OSX)
-                    let paragraphStyle = NSParagraphStyle.default().mutableCopy() as! NSMutableParagraphStyle
-                #else
-                    let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
-                #endif
-                paragraphStyle.lineBreakMode = NSLineBreakMode.byTruncatingTail
+                let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
+                paragraphStyle.lineBreakMode = .byTruncatingTail
                 paragraphStyle.alignment = .center
                 
                 attrString = NSMutableAttributedString(string: newValue!)
                 attrString?.setAttributes([
-                    NSForegroundColorAttributeName: NSUIColor.black,
-                    NSFontAttributeName: NSUIFont.systemFont(ofSize: 12.0),
-                    NSParagraphStyleAttributeName: paragraphStyle
+                    .foregroundColor: NSUIColor.labelOrBlack,
+                    .font: NSUIFont.systemFont(ofSize: 12.0),
+                    .paragraphStyle: paragraphStyle
                     ], range: NSMakeRange(0, attrString!.length))
             }
             self.centerAttributedText = attrString
@@ -404,7 +373,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// the text that is displayed in the center of the pie-chart
-    open var centerAttributedText: NSAttributedString?
+    @objc open var centerAttributedText: NSAttributedString?
     {
         get
         {
@@ -418,7 +387,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// Sets the offset the center text should have from it's original position in dp. Default x = 0, y = 0
-    open var centerTextOffset: CGPoint
+    @objc open var centerTextOffset: CGPoint
     {
         get
         {
@@ -432,7 +401,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// `true` if drawing the center text is enabled
-    open var drawCenterTextEnabled: Bool
+    @objc open var drawCenterTextEnabled: Bool
     {
         get
         {
@@ -445,8 +414,8 @@ open class PieChartView: PieRadarChartViewBase
         }
     }
     
-    /// - returns: `true` if drawing the center text is enabled
-    open var isDrawCenterTextEnabled: Bool
+    /// `true` if drawing the center text is enabled
+    @objc open var isDrawCenterTextEnabled: Bool
     {
         get
         {
@@ -469,14 +438,14 @@ open class PieChartView: PieRadarChartViewBase
         return _circleBox.width / 2.0
     }
     
-    /// - returns: The circlebox, the boundingbox of the pie-chart slices
-    open var circleBox: CGRect
+    /// The circlebox, the boundingbox of the pie-chart slices
+    @objc open var circleBox: CGRect
     {
         return _circleBox
     }
     
-    /// - returns: The center of the circlebox
-    open var centerCircleBox: CGPoint
+    /// The center of the circlebox
+    @objc open var centerCircleBox: CGPoint
     {
         return CGPoint(x: _circleBox.midX, y: _circleBox.midY)
     }
@@ -484,7 +453,7 @@ open class PieChartView: PieRadarChartViewBase
     /// the radius of the hole in the center of the piechart in percent of the maximum radius (max = the radius of the whole chart)
     /// 
     /// **default**: 0.5 (50%) (half the pie)
-    open var holeRadiusPercent: CGFloat
+    @objc open var holeRadiusPercent: CGFloat
     {
         get
         {
@@ -500,7 +469,7 @@ open class PieChartView: PieRadarChartViewBase
     /// The color that the transparent-circle should have.
     ///
     /// **default**: `nil`
-    open var transparentCircleColor: NSUIColor?
+    @objc open var transparentCircleColor: NSUIColor?
     {
         get
         {
@@ -516,7 +485,7 @@ open class PieChartView: PieRadarChartViewBase
     /// the radius of the transparent circle that is drawn next to the hole in the piechart in percent of the maximum radius (max = the radius of the whole chart)
     /// 
     /// **default**: 0.55 (55%) -> means 5% larger than the center-hole by default
-    open var transparentCircleRadiusPercent: CGFloat
+    @objc open var transparentCircleRadiusPercent: CGFloat
     {
         get
         {
@@ -528,33 +497,9 @@ open class PieChartView: PieRadarChartViewBase
             setNeedsDisplay()
         }
     }
-    
-    /// set this to true to draw the enrty labels into the pie slices
-    @available(*, deprecated: 1.0, message: "Use `drawEntryLabelsEnabled` instead.")
-    open var drawSliceTextEnabled: Bool
-    {
-        get
-        {
-            return drawEntryLabelsEnabled
-        }
-        set
-        {
-            drawEntryLabelsEnabled = newValue
-        }
-    }
-    
-    /// - returns: `true` if drawing entry labels is enabled, `false` ifnot
-    @available(*, deprecated: 1.0, message: "Use `isDrawEntryLabelsEnabled` instead.")
-    open var isDrawSliceTextEnabled: Bool
-    {
-        get
-        {
-            return isDrawEntryLabelsEnabled
-        }
-    }
-    
+        
     /// The color the entry labels are drawn with.
-    open var entryLabelColor: NSUIColor?
+    @objc open var entryLabelColor: NSUIColor?
     {
         get { return _entryLabelColor }
         set
@@ -565,7 +510,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// The font the entry labels are drawn with.
-    open var entryLabelFont: NSUIFont?
+    @objc open var entryLabelFont: NSUIFont?
     {
         get { return _entryLabelFont }
         set
@@ -576,7 +521,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// Set this to true to draw the enrty labels into the pie slices
-    open var drawEntryLabelsEnabled: Bool
+    @objc open var drawEntryLabelsEnabled: Bool
     {
         get
         {
@@ -589,8 +534,8 @@ open class PieChartView: PieRadarChartViewBase
         }
     }
     
-    /// - returns: `true` if drawing entry labels is enabled, `false` ifnot
-    open var isDrawEntryLabelsEnabled: Bool
+    /// `true` if drawing entry labels is enabled, `false` ifnot
+    @objc open var isDrawEntryLabelsEnabled: Bool
     {
         get
         {
@@ -599,7 +544,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// If this is enabled, values inside the PieChart are drawn in percent and not with their original value. Values provided for the ValueFormatter to format are then provided in percent.
-    open var usePercentValuesEnabled: Bool
+    @objc open var usePercentValuesEnabled: Bool
     {
         get
         {
@@ -612,8 +557,8 @@ open class PieChartView: PieRadarChartViewBase
         }
     }
     
-    /// - returns: `true` if drawing x-values is enabled, `false` ifnot
-    open var isUsePercentValuesEnabled: Bool
+    /// `true` if drawing x-values is enabled, `false` ifnot
+    @objc open var isUsePercentValuesEnabled: Bool
     {
         get
         {
@@ -622,7 +567,7 @@ open class PieChartView: PieRadarChartViewBase
     }
     
     /// the rectangular radius of the bounding box for the center text, as a percentage of the pie hole
-    open var centerTextRadiusPercent: CGFloat
+    @objc open var centerTextRadiusPercent: CGFloat
     {
         get
         {
@@ -638,7 +583,7 @@ open class PieChartView: PieRadarChartViewBase
     /// The max angle that is used for calculating the pie-circle.
     /// 360 means it's a full pie-chart, 180 results in a half-pie-chart.
     /// **default**: 360.0
-    open var maxAngle: CGFloat
+    @objc open var maxAngle: CGFloat
     {
         get
         {
diff --git a/Source/Charts/Charts/PieRadarChartViewBase.swift b/Source/Charts/Charts/PieRadarChartViewBase.swift
old mode 100755
new mode 100644
index 0d99e2a8dd..86edcd84ba
--- a/Source/Charts/Charts/PieRadarChartViewBase.swift
+++ b/Source/Charts/Charts/PieRadarChartViewBase.swift
@@ -11,32 +11,34 @@
 
 import Foundation
 import CoreGraphics
+import QuartzCore
 
-#if !os(OSX)
-    import UIKit
+#if canImport(AppKit)
+import AppKit
 #endif
 
+
 /// Base class of PieChartView and RadarChartView.
 open class PieRadarChartViewBase: ChartViewBase
 {
     /// holds the normalized version of the current rotation angle of the chart
-    fileprivate var _rotationAngle = CGFloat(270.0)
+    private var _rotationAngle = CGFloat(270.0)
     
     /// holds the raw version of the current rotation angle of the chart
-    fileprivate var _rawRotationAngle = CGFloat(270.0)
+    private var _rawRotationAngle = CGFloat(270.0)
     
     /// flag that indicates if rotation is enabled or not
-    open var rotationEnabled = true
+    @objc open var rotationEnabled = true
     
     /// Sets the minimum offset (padding) around the chart, defaults to 0.0
-    open var minOffset = CGFloat(0.0)
+    @objc open var minOffset = CGFloat(0.0)
 
     /// iOS && OSX only: Enabled multi-touch rotation using two fingers.
-    fileprivate var _rotationWithTwoFingers = false
+    private var _rotationWithTwoFingers = false
     
-    fileprivate var _tapGestureRecognizer: NSUITapGestureRecognizer!
+    private var _tapGestureRecognizer: NSUITapGestureRecognizer!
     #if !os(tvOS)
-    fileprivate var _rotationGestureRecognizer: NSUIRotationGestureRecognizer!
+    private var _rotationGestureRecognizer: NSUIRotationGestureRecognizer!
     #endif
     
     public override init(frame: CGRect)
@@ -63,9 +65,9 @@ open class PieRadarChartViewBase: ChartViewBase
         self.addGestureRecognizer(_tapGestureRecognizer)
 
         #if !os(tvOS)
-            _rotationGestureRecognizer = NSUIRotationGestureRecognizer(target: self, action: #selector(rotationGestureRecognized(_:)))
-            self.addGestureRecognizer(_rotationGestureRecognizer)
-            _rotationGestureRecognizer.isEnabled = rotationWithTwoFingers
+        _rotationGestureRecognizer = NSUIRotationGestureRecognizer(target: self, action: #selector(rotationGestureRecognized(_:)))
+        self.addGestureRecognizer(_rotationGestureRecognizer)
+        _rotationGestureRecognizer.isEnabled = rotationWithTwoFingers
         #endif
     }
     
@@ -88,7 +90,7 @@ open class PieRadarChartViewBase: ChartViewBase
         
         if let data = _data , _legend !== nil
         {
-            _legendRenderer.computeLegend(data: data)
+            legendRenderer.computeLegend(data: data)
         }
         
         calculateOffsets()
@@ -226,7 +228,7 @@ open class PieRadarChartViewBase: ChartViewBase
         
         var minOffset = self.minOffset
         
-        if (self.isKind(of: RadarChartView.self))
+        if self is RadarChartView
         {
             let x = self.xAxis
             
@@ -244,9 +246,9 @@ open class PieRadarChartViewBase: ChartViewBase
         _viewPortHandler.restrainViewPort(offsetLeft: offsetLeft, offsetTop: offsetTop, offsetRight: offsetRight, offsetBottom: offsetBottom)
     }
 
-    /// - returns: The angle relative to the chart center for the given point on the chart in degrees.
+    /// - Returns: The angle relative to the chart center for the given point on the chart in degrees.
     /// The angle is always between 0 and 360°, 0° is NORTH, 90° is EAST, ...
-    open func angleForPoint(x: CGFloat, y: CGFloat) -> CGFloat
+    @objc open func angleForPoint(x: CGFloat, y: CGFloat) -> CGFloat
     {
         let c = centerOffsets
         
@@ -255,7 +257,7 @@ open class PieRadarChartViewBase: ChartViewBase
         let length = sqrt(tx * tx + ty * ty)
         let r = acos(ty / length)
 
-        var angle = r * ChartUtils.Math.RAD2DEG
+        var angle = r.RAD2DEG
 
         if x > c.x
         {
@@ -276,14 +278,14 @@ open class PieRadarChartViewBase: ChartViewBase
     
     /// Calculates the position around a center point, depending on the distance
     /// from the center, and the angle of the position around the center.
-    open func getPosition(center: CGPoint, dist: CGFloat, angle: CGFloat) -> CGPoint
+    @objc open func getPosition(center: CGPoint, dist: CGFloat, angle: CGFloat) -> CGPoint
     {
-        return CGPoint(x: center.x + dist * cos(angle * ChartUtils.Math.FDEG2RAD),
-                y: center.y + dist * sin(angle * ChartUtils.Math.FDEG2RAD))
+        return CGPoint(x: center.x + dist * cos(angle.DEG2RAD),
+                y: center.y + dist * sin(angle.DEG2RAD))
     }
 
-    /// - returns: The distance of a certain point on the chart to the center of the chart.
-    open func distanceToCenter(x: CGFloat, y: CGFloat) -> CGFloat
+    /// - Returns: The distance of a certain point on the chart to the center of the chart.
+    @objc open func distanceToCenter(x: CGFloat, y: CGFloat) -> CGFloat
     {
         let c = self.centerOffsets
 
@@ -316,9 +318,9 @@ open class PieRadarChartViewBase: ChartViewBase
         return dist
     }
 
-    /// - returns: The xIndex for the given angle around the center of the chart.
+    /// - Returns: The xIndex for the given angle around the center of the chart.
     /// -1 if not found / outofbounds.
-    open func indexForAngle(_ angle: CGFloat) -> Int
+    @objc open func indexForAngle(_ angle: CGFloat) -> Int
     {
         fatalError("indexForAngle() cannot be called on PieRadarChartViewBase")
     }
@@ -326,8 +328,8 @@ open class PieRadarChartViewBase: ChartViewBase
     /// current rotation angle of the pie chart
     ///
     /// **default**: 270 --> top (NORTH)
-    /// - returns: Will always return a normalized value, which will be between 0.0 < 360.0
-    open var rotationAngle: CGFloat
+    /// Will always return a normalized value, which will be between 0.0 < 360.0
+    @objc open var rotationAngle: CGFloat
     {
         get
         {
@@ -336,20 +338,20 @@ open class PieRadarChartViewBase: ChartViewBase
         set
         {
             _rawRotationAngle = newValue
-            _rotationAngle = ChartUtils.normalizedAngleFromAngle(newValue)
+            _rotationAngle = newValue.normalizedAngle
             setNeedsDisplay()
         }
     }
     
     /// gets the raw version of the current rotation angle of the pie chart the returned value could be any value, negative or positive, outside of the 360 degrees. 
     /// this is used when working with rotation direction, mainly by gestures and animations.
-    open var rawRotationAngle: CGFloat
+    @objc open var rawRotationAngle: CGFloat
     {
         return _rawRotationAngle
     }
 
-    /// - returns: The diameter of the pie- or radar-chart
-    open var diameter: CGFloat
+    /// The diameter of the pie- or radar-chart
+    @objc open var diameter: CGFloat
     {
         var content = _viewPortHandler.contentRect
         content.origin.x += extraLeftOffset
@@ -359,19 +361,19 @@ open class PieRadarChartViewBase: ChartViewBase
         return min(content.width, content.height)
     }
 
-    /// - returns: The radius of the chart in pixels.
-    open var radius: CGFloat
+    /// The radius of the chart in pixels.
+    @objc open var radius: CGFloat
     {
         fatalError("radius cannot be called on PieRadarChartViewBase")
     }
 
-    /// - returns: The required offset for the chart legend.
+    /// The required offset for the chart legend.
     internal var requiredLegendOffset: CGFloat
     {
         fatalError("requiredLegendOffset cannot be called on PieRadarChartViewBase")
     }
 
-    /// - returns: The base offset needed for the chart without calculating the
+    /// - Returns: The base offset needed for the chart without calculating the
     /// legend size.
     internal var requiredBaseOffset: CGFloat
     {
@@ -388,7 +390,7 @@ open class PieRadarChartViewBase: ChartViewBase
         return 0.0
     }
     
-    open var isRotationEnabled: Bool { return rotationEnabled }
+    @objc open var isRotationEnabled: Bool { return rotationEnabled }
     
     /// flag that indicates if rotation is done with two fingers or one.
     /// when the chart is inside a scrollview, you need a two-finger rotation because a one-finger rotation eats up all touch events.
@@ -397,7 +399,7 @@ open class PieRadarChartViewBase: ChartViewBase
     /// On OSX this will keep two-finger multitouch rotation, and one-pointer mouse rotation.
     /// 
     /// **default**: false
-    open var rotationWithTwoFingers: Bool
+    @objc open var rotationWithTwoFingers: Bool
     {
         get
         {
@@ -407,7 +409,7 @@ open class PieRadarChartViewBase: ChartViewBase
         {
             _rotationWithTwoFingers = newValue
             #if !os(tvOS)
-                _rotationGestureRecognizer.isEnabled = _rotationWithTwoFingers
+            _rotationGestureRecognizer.isEnabled = _rotationWithTwoFingers
             #endif
         }
     }
@@ -419,17 +421,17 @@ open class PieRadarChartViewBase: ChartViewBase
     /// On OSX this will keep two-finger multitouch rotation, and one-pointer mouse rotation.
     ///
     /// **default**: false
-    open var isRotationWithTwoFingers: Bool
+    @objc open var isRotationWithTwoFingers: Bool
     {
         return _rotationWithTwoFingers
     }
     
     // MARK: - Animation
     
-    fileprivate var _spinAnimator: Animator!
+    private var _spinAnimator: Animator!
     
     /// Applys a spin animation to the Chart.
-    open func spin(duration: TimeInterval, fromAngle: CGFloat, toAngle: CGFloat, easing: ChartEasingFunctionBlock?)
+    @objc open func spin(duration: TimeInterval, fromAngle: CGFloat, toAngle: CGFloat, easing: ChartEasingFunctionBlock?)
     {
         if _spinAnimator != nil
         {
@@ -445,17 +447,17 @@ open class PieRadarChartViewBase: ChartViewBase
         _spinAnimator.animate(xAxisDuration: duration, easing: easing)
     }
     
-    open func spin(duration: TimeInterval, fromAngle: CGFloat, toAngle: CGFloat, easingOption: ChartEasingOption)
+    @objc open func spin(duration: TimeInterval, fromAngle: CGFloat, toAngle: CGFloat, easingOption: ChartEasingOption)
     {
         spin(duration: duration, fromAngle: fromAngle, toAngle: toAngle, easing: easingFunctionFromOption(easingOption))
     }
     
-    open func spin(duration: TimeInterval, fromAngle: CGFloat, toAngle: CGFloat)
+    @objc open func spin(duration: TimeInterval, fromAngle: CGFloat, toAngle: CGFloat)
     {
         spin(duration: duration, fromAngle: fromAngle, toAngle: toAngle, easing: nil)
     }
     
-    open func stopSpinAnimation()
+    @objc open func stopSpinAnimation()
     {
         if _spinAnimator != nil
         {
@@ -465,21 +467,21 @@ open class PieRadarChartViewBase: ChartViewBase
     
     // MARK: - Gestures
     
-    fileprivate var _rotationGestureStartPoint: CGPoint!
-    fileprivate var _isRotating = false
-    fileprivate var _startAngle = CGFloat(0.0)
+    private var _rotationGestureStartPoint: CGPoint!
+    private var _isRotating = false
+    private var _startAngle = CGFloat(0.0)
     
-    fileprivate struct AngularVelocitySample
+    private struct AngularVelocitySample
     {
         var time: TimeInterval
         var angle: CGFloat
     }
     
-    fileprivate var _velocitySamples = [AngularVelocitySample]()
+    private var velocitySamples = [AngularVelocitySample]()
     
-    fileprivate var _decelerationLastTime: TimeInterval = 0.0
-    fileprivate var _decelerationDisplayLink: NSUIDisplayLink!
-    fileprivate var _decelerationAngularVelocity: CGFloat = 0.0
+    private var _decelerationLastTime: TimeInterval = 0.0
+    private var _decelerationDisplayLink: NSUIDisplayLink!
+    private var _decelerationAngularVelocity: CGFloat = 0.0
     
     internal final func processRotationGestureBegan(location: CGPoint)
     {
@@ -532,7 +534,7 @@ open class PieRadarChartViewBase: ChartViewBase
             {
                 _decelerationLastTime = CACurrentMediaTime()
                 _decelerationDisplayLink = NSUIDisplayLink(target: self, selector: #selector(PieRadarChartViewBase.decelerationLoop))
-                _decelerationDisplayLink.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
+                _decelerationDisplayLink.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
             }
         }
     }
@@ -553,13 +555,9 @@ open class PieRadarChartViewBase: ChartViewBase
         {
             stopDeceleration()
             
-            if !rotationWithTwoFingers
+            if !rotationWithTwoFingers, let touchLocation = touches.first?.location(in: self)
             {
-                let touch = touches.first as NSUITouch!
-                
-                let touchLocation = touch?.location(in: self)
-                
-                processRotationGestureBegan(location: touchLocation!)
+                processRotationGestureBegan(location: touchLocation)
             }
         }
         
@@ -571,13 +569,10 @@ open class PieRadarChartViewBase: ChartViewBase
     
     open override func nsuiTouchesMoved(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
     {
-        if rotationEnabled && !rotationWithTwoFingers
+        if rotationEnabled && !rotationWithTwoFingers, let touch = touches.first
         {
-            let touch = touches.first as NSUITouch!
-            
-            let touchLocation = touch?.location(in: self)
-            
-            processRotationGestureMoved(location: touchLocation!)
+            let touchLocation = touch.location(in: self)
+            processRotationGestureMoved(location: touchLocation)
         }
         
         if !_isRotating
@@ -593,13 +588,10 @@ open class PieRadarChartViewBase: ChartViewBase
             super.nsuiTouchesEnded(touches, withEvent: event)
         }
         
-        if rotationEnabled && !rotationWithTwoFingers
+        if rotationEnabled && !rotationWithTwoFingers, let touch = touches.first
         {
-            let touch = touches.first as NSUITouch!
-            
-            let touchLocation = touch?.location(in: self)
-            
-            processRotationGestureEnded(location: touchLocation!)
+            let touchLocation = touch.location(in: self)
+            processRotationGestureEnded(location: touchLocation)
         }
         
         if _isRotating
@@ -671,24 +663,28 @@ open class PieRadarChartViewBase: ChartViewBase
     }
     #endif
     
-    fileprivate func resetVelocity()
+    private func resetVelocity()
     {
-        _velocitySamples.removeAll(keepingCapacity: false)
+        velocitySamples.removeAll(keepingCapacity: false)
     }
     
-    fileprivate func sampleVelocity(touchLocation: CGPoint)
+    private func sampleVelocity(touchLocation: CGPoint)
     {
-        let currentTime = CACurrentMediaTime()
-        
-        _velocitySamples.append(AngularVelocitySample(time: currentTime, angle: angleForPoint(x: touchLocation.x, y: touchLocation.y)))
-        
+        let currentSample: AngularVelocitySample = {
+            let time = CACurrentMediaTime()
+            let angle = angleForPoint(x: touchLocation.x, y: touchLocation.y)
+            return AngularVelocitySample(time: time, angle: angle)
+        }()
+
         // Remove samples older than our sample time - 1 seconds
-        var i = 0, count = _velocitySamples.count
+        // while keeping at least one sample
+        
+        var i = 0, count = velocitySamples.count
         while (i < count - 2)
         {
-            if currentTime - _velocitySamples[i].time > 1.0
+            if currentSample.time - velocitySamples[i].time > 1.0
             {
-                _velocitySamples.remove(at: 0)
+                velocitySamples.remove(at: 0)
                 i -= 1
                 count -= 1
             }
@@ -696,47 +692,37 @@ open class PieRadarChartViewBase: ChartViewBase
             {
                 break
             }
-            
+
             i += 1
         }
+
+        velocitySamples.append(currentSample)
     }
-    
-    fileprivate func calculateVelocity() -> CGFloat
+
+    private func calculateVelocity() -> CGFloat
     {
-        if _velocitySamples.isEmpty
-        {
-            return 0.0
-        }
-        
-        var firstSample = _velocitySamples[0]
-        var lastSample = _velocitySamples[_velocitySamples.count - 1]
-        
+        guard var firstSample = velocitySamples.first,
+            var lastSample = velocitySamples.last
+            else { return 0 }
+
         // Look for a sample that's closest to the latest sample, but not the same, so we can deduce the direction
-        var beforeLastSample = firstSample
-        for i in stride(from: (_velocitySamples.count - 1), through: 0, by: -1)
-        {
-            beforeLastSample = _velocitySamples[i]
-            if beforeLastSample.angle != lastSample.angle
-            {
-                break
-            }
-        }
-        
+        let beforeLastSample = velocitySamples.last { $0.angle != lastSample.angle }
+            ?? firstSample
+
         // Calculate the sampling time
-        var timeDelta = lastSample.time - firstSample.time
-        if timeDelta == 0.0
-        {
-            timeDelta = 0.1
-        }
-        
+        let timeDelta: CGFloat = {
+            let delta = CGFloat(lastSample.time - firstSample.time)
+            return delta == 0 ? 0.1 : delta
+        }()
+
         // Calculate clockwise/ccw by choosing two values that should be closest to each other,
         // so if the angles are two far from each other we know they are inverted "for sure"
-        var clockwise = lastSample.angle >= beforeLastSample.angle
-        if (abs(lastSample.angle - beforeLastSample.angle) > 270.0)
-        {
-            clockwise = !clockwise
-        }
-        
+        let isClockwise: Bool = {
+            let isClockwise = lastSample.angle >= beforeLastSample.angle
+            let isInverted = abs(lastSample.angle - beforeLastSample.angle) > 270.0
+            return isInverted ? !isClockwise : isClockwise
+        }()
+
         // Now if the "gesture" is over a too big of an angle - then we know the angles are inverted, and we need to move them closer to each other from both sides of the 360.0 wrapping point
         if lastSample.angle - firstSample.angle > 180.0
         {
@@ -746,21 +732,14 @@ open class PieRadarChartViewBase: ChartViewBase
         {
             lastSample.angle += 360.0
         }
-        
+
         // The velocity
-        var velocity = abs((lastSample.angle - firstSample.angle) / CGFloat(timeDelta))
-        
-        // Direction?
-        if !clockwise
-        {
-            velocity = -velocity
-        }
-        
-        return velocity
+        let velocity = abs((lastSample.angle - firstSample.angle) / timeDelta)
+        return isClockwise ? velocity : -velocity
     }
-    
+
     /// sets the starting angle of the rotation, this is only used by the touch listener, x and y is the touch position
-    fileprivate func setGestureStartAngle(x: CGFloat, y: CGFloat)
+    private func setGestureStartAngle(x: CGFloat, y: CGFloat)
     {
         _startAngle = angleForPoint(x: x, y: y)
         
@@ -769,21 +748,21 @@ open class PieRadarChartViewBase: ChartViewBase
     }
     
     /// updates the view rotation depending on the given touch position, also takes the starting angle into consideration
-    fileprivate func updateGestureRotation(x: CGFloat, y: CGFloat)
+    private func updateGestureRotation(x: CGFloat, y: CGFloat)
     {
         self.rotationAngle = angleForPoint(x: x, y: y) - _startAngle
     }
     
-    open func stopDeceleration()
+    @objc open func stopDeceleration()
     {
         if _decelerationDisplayLink !== nil
         {
-            _decelerationDisplayLink.remove(from: RunLoop.main, forMode: RunLoopMode.commonModes)
+            _decelerationDisplayLink.remove(from: RunLoop.main, forMode: RunLoop.Mode.common)
             _decelerationDisplayLink = nil
         }
     }
     
-    @objc fileprivate func decelerationLoop()
+    @objc private func decelerationLoop()
     {
         let currentTime = CACurrentMediaTime()
         
@@ -801,16 +780,16 @@ open class PieRadarChartViewBase: ChartViewBase
         }
     }
     
-    /// - returns: The distance between two points
-    fileprivate func distance(eventX: CGFloat, startX: CGFloat, eventY: CGFloat, startY: CGFloat) -> CGFloat
+    /// - Returns: The distance between two points
+    private func distance(eventX: CGFloat, startX: CGFloat, eventY: CGFloat, startY: CGFloat) -> CGFloat
     {
         let dx = eventX - startX
         let dy = eventY - startY
         return sqrt(dx * dx + dy * dy)
     }
     
-    /// - returns: The distance between two points
-    fileprivate func distance(from: CGPoint, to: CGPoint) -> CGFloat
+    /// - Returns: The distance between two points
+    private func distance(from: CGPoint, to: CGPoint) -> CGFloat
     {
         let dx = from.x - to.x
         let dy = from.y - to.y
@@ -818,9 +797,9 @@ open class PieRadarChartViewBase: ChartViewBase
     }
     
     /// reference to the last highlighted object
-    fileprivate var _lastHighlight: Highlight!
+    private var _lastHighlight: Highlight!
     
-    @objc fileprivate func tapGestureRecognized(_ recognizer: NSUITapGestureRecognizer)
+    @objc private func tapGestureRecognized(_ recognizer: NSUITapGestureRecognizer)
     {
         if recognizer.state == NSUIGestureRecognizerState.ended
         {
@@ -834,7 +813,7 @@ open class PieRadarChartViewBase: ChartViewBase
     }
     
     #if !os(tvOS)
-    @objc fileprivate func rotationGestureRecognized(_ recognizer: NSUIRotationGestureRecognizer)
+    @objc private func rotationGestureRecognized(_ recognizer: NSUIRotationGestureRecognizer)
     {
         if recognizer.state == NSUIGestureRecognizerState.began
         {
@@ -845,14 +824,14 @@ open class PieRadarChartViewBase: ChartViewBase
         
         if recognizer.state == NSUIGestureRecognizerState.began || recognizer.state == NSUIGestureRecognizerState.changed
         {
-            let angle = ChartUtils.Math.FRAD2DEG * recognizer.nsuiRotation
+            let angle = recognizer.nsuiRotation.RAD2DEG
             
             self.rotationAngle = _startAngle + angle
             setNeedsDisplay()
         }
         else if recognizer.state == NSUIGestureRecognizerState.ended
         {
-            let angle = ChartUtils.Math.FRAD2DEG * recognizer.nsuiRotation
+            let angle = recognizer.nsuiRotation.RAD2DEG
             
             self.rotationAngle = _startAngle + angle
             setNeedsDisplay()
@@ -861,13 +840,13 @@ open class PieRadarChartViewBase: ChartViewBase
             {
                 stopDeceleration()
                 
-                _decelerationAngularVelocity = ChartUtils.Math.FRAD2DEG * recognizer.velocity
+                _decelerationAngularVelocity = recognizer.velocity.RAD2DEG
                 
                 if _decelerationAngularVelocity != 0.0
                 {
                     _decelerationLastTime = CACurrentMediaTime()
                     _decelerationDisplayLink = NSUIDisplayLink(target: self, selector: #selector(PieRadarChartViewBase.decelerationLoop))
-                    _decelerationDisplayLink.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
+                    _decelerationDisplayLink.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
                 }
             }
         }
diff --git a/Source/Charts/Charts/RadarChartView.swift b/Source/Charts/Charts/RadarChartView.swift
index 84cf460ce1..6bcad33613 100644
--- a/Source/Charts/Charts/RadarChartView.swift
+++ b/Source/Charts/Charts/RadarChartView.swift
@@ -18,28 +18,28 @@ import CoreGraphics
 open class RadarChartView: PieRadarChartViewBase
 {
     /// width of the web lines that come from the center.
-    open var webLineWidth = CGFloat(1.5)
+    @objc open var webLineWidth = CGFloat(1.5)
     
     /// width of the web lines that are in between the lines coming from the center
-    open var innerWebLineWidth = CGFloat(0.75)
+    @objc open var innerWebLineWidth = CGFloat(0.75)
     
     /// color for the web lines that come from the center
-    open var webColor = NSUIColor(red: 122/255.0, green: 122/255.0, blue: 122.0/255.0, alpha: 1.0)
+    @objc open var webColor = NSUIColor(red: 122/255.0, green: 122/255.0, blue: 122.0/255.0, alpha: 1.0)
     
     /// color for the web lines in between the lines that come from the center.
-    open var innerWebColor = NSUIColor(red: 122/255.0, green: 122/255.0, blue: 122.0/255.0, alpha: 1.0)
+    @objc open var innerWebColor = NSUIColor(red: 122/255.0, green: 122/255.0, blue: 122.0/255.0, alpha: 1.0)
     
     /// transparency the grid is drawn with (0.0 - 1.0)
-    open var webAlpha: CGFloat = 150.0 / 255.0
+    @objc open var webAlpha: CGFloat = 150.0 / 255.0
     
     /// flag indicating if the web lines should be drawn or not
-    open var drawWeb = true
+    @objc open var drawWeb = true
     
     /// modulus that determines how many labels and web-lines are skipped before the next is drawn
-    fileprivate var _skipWebLineCount = 0
+    private var _skipWebLineCount = 0
     
     /// the object reprsenting the y-axis labels
-    fileprivate var _yAxis: YAxis!
+    private var _yAxis: YAxis!
     
     internal var _yAxisRenderer: YAxisRendererRadarChart!
     internal var _xAxisRenderer: XAxisRendererRadarChart!
@@ -59,6 +59,7 @@ open class RadarChartView: PieRadarChartViewBase
         super.initialize()
         
         _yAxis = YAxis(position: .left)
+        _yAxis.labelXOffset = 10.0
         
         renderer = RadarChartRenderer(chart: self, animator: _animator, viewPortHandler: _viewPortHandler)
         
@@ -81,7 +82,7 @@ open class RadarChartView: PieRadarChartViewBase
     open override func notifyDataSetChanged()
     {
         calcMinMax()
-        
+
         _yAxisRenderer?.computeAxis(min: _yAxis._axisMinimum, max: _yAxis._axisMaximum, inverted: _yAxis.isInverted)
         _xAxisRenderer?.computeAxis(min: _xAxis._axisMinimum, max: _xAxis._axisMaximum, inverted: false)
         
@@ -89,7 +90,7 @@ open class RadarChartView: PieRadarChartViewBase
             let legend = _legend,
             !legend.isLegendCustom
         {
-            _legendRenderer?.computeLegend(data: data)
+            legendRenderer?.computeLegend(data: data)
         }
         
         calculateOffsets()
@@ -101,10 +102,7 @@ open class RadarChartView: PieRadarChartViewBase
     {
         super.draw(rect)
 
-        if _data === nil
-        {
-            return
-        }
+        guard data != nil, let renderer = renderer else { return }
         
         let optionalContext = NSUIGraphicsGetCurrentContext()
         guard let context = optionalContext else { return }
@@ -118,7 +116,7 @@ open class RadarChartView: PieRadarChartViewBase
         
         if drawWeb
         {
-            renderer!.drawExtras(context: context)
+            renderer.drawExtras(context: context)
         }
         
         if _yAxis.isEnabled && _yAxis.isDrawLimitLinesBehindDataEnabled
@@ -126,11 +124,11 @@ open class RadarChartView: PieRadarChartViewBase
             _yAxisRenderer.renderLimitLines(context: context)
         }
 
-        renderer!.drawData(context: context)
+        renderer.drawData(context: context)
 
         if valuesToHighlight()
         {
-            renderer!.drawHighlighted(context: context, indices: _indicesToHighlight)
+            renderer.drawHighlighted(context: context, indices: _indicesToHighlight)
         }
         
         if _yAxis.isEnabled && !_yAxis.isDrawLimitLinesBehindDataEnabled
@@ -140,25 +138,25 @@ open class RadarChartView: PieRadarChartViewBase
         
         _yAxisRenderer.renderAxisLabels(context: context)
 
-        renderer!.drawValues(context: context)
+        renderer.drawValues(context: context)
 
-        _legendRenderer.renderLegend(context: context)
+        legendRenderer.renderLegend(context: context)
 
         drawDescription(context: context)
 
         drawMarkers(context: context)
     }
 
-    /// - returns: The factor that is needed to transform values into pixels.
-    open var factor: CGFloat
+    /// The factor that is needed to transform values into pixels.
+    @objc open var factor: CGFloat
     {
         let content = _viewPortHandler.contentRect
         return min(content.width / 2.0, content.height / 2.0)
                 / CGFloat(_yAxis.axisRange)
     }
 
-    /// - returns: The angle that each slice in the radar chart occupies.
-    open var sliceAngle: CGFloat
+    /// The angle that each slice in the radar chart occupies.
+    @objc open var sliceAngle: CGFloat
     {
         return 360.0 / CGFloat(_data?.maxEntryCountSet?.entryCount ?? 0)
     }
@@ -166,37 +164,25 @@ open class RadarChartView: PieRadarChartViewBase
     open override func indexForAngle(_ angle: CGFloat) -> Int
     {
         // take the current angle of the chart into consideration
-        let a = ChartUtils.normalizedAngleFromAngle(angle - self.rotationAngle)
+        let a = (angle - self.rotationAngle).normalizedAngle
         
         let sliceAngle = self.sliceAngle
         
         let max = _data?.maxEntryCountSet?.entryCount ?? 0
-        
-        var index = 0
-        
-        for i in 0..<max
-        {
-            let referenceAngle = sliceAngle * CGFloat(i + 1) - sliceAngle / 2.0
-            
-            if referenceAngle > a
-            {
-                index = i
-                break
-            }
-        }
-        
-        return index
+        return (0..<max).firstIndex {
+            sliceAngle * CGFloat($0 + 1) - sliceAngle / 2.0 > a
+        } ?? max
     }
 
-    /// - returns: The object that represents all y-labels of the RadarChart.
-    open var yAxis: YAxis
+    /// The object that represents all y-labels of the RadarChart.
+    @objc open var yAxis: YAxis
     {
         return _yAxis
     }
 
     /// Sets the number of web-lines that should be skipped on chart web before the next one is drawn. This targets the lines that come from the center of the RadarChart.
     /// if count = 1 -> 1 line is skipped in between
-    open var skipWebLineCount: Int
+    @objc open var skipWebLineCount: Int
     {
         get
         {
@@ -224,12 +210,12 @@ open class RadarChartView: PieRadarChartViewBase
         return min(content.width / 2.0, content.height / 2.0)
     }
 
-    /// - returns: The maximum value this chart can display on it's y-axis.
+    /// The maximum value this chart can display on it's y-axis.
     open override var chartYMax: Double { return _yAxis._axisMaximum }
     
-    /// - returns: The minimum value this chart can display on it's y-axis.
+    /// The minimum value this chart can display on it's y-axis.
     open override var chartYMin: Double { return _yAxis._axisMinimum }
     
-    /// - returns: The range of y-values this chart can display.
-    open var yRange: Double { return _yAxis.axisRange }
+    /// The range of y-values this chart can display.
+    @objc open var yRange: Double { return _yAxis.axisRange }
 }
diff --git a/Source/Charts/Charts/ScatterChartView.swift b/Source/Charts/Charts/ScatterChartView.swift
index d1bf82b4c6..22c710ad83 100644
--- a/Source/Charts/Charts/ScatterChartView.swift
+++ b/Source/Charts/Charts/ScatterChartView.swift
@@ -25,7 +25,7 @@ open class ScatterChartView: BarLineChartViewBase, ScatterChartDataProvider
         xAxis.spaceMax = 0.5
     }
     
-    // MARK: - ScatterChartDataProbider
+    // MARK: - ScatterChartDataProvider
     
     open var scatterData: ScatterChartData? { return _data as? ScatterChartData }
 }
diff --git a/Source/Charts/Components/AxisBase.swift b/Source/Charts/Components/AxisBase.swift
index 0557a10fd2..72600cf84e 100755
--- a/Source/Charts/Components/AxisBase.swift
+++ b/Source/Charts/Components/AxisBase.swift
@@ -22,85 +22,89 @@ open class AxisBase: ComponentBase
     }
     
     /// Custom formatter that is used instead of the auto-formatter if set
-    fileprivate var _axisValueFormatter: IAxisValueFormatter?
-    open var isStringFromIndex = false
-    
-    open var labelFont = NSUIFont.systemFont(ofSize: 10.0)
-    open var labelTextColor = NSUIColor.black
+    private var _axisValueFormatter: IAxisValueFormatter?
+
+    @objc open var labelFont = NSUIFont.systemFont(ofSize: 10.0)
+    @objc open var labelTextColor = NSUIColor.labelOrBlack
     
-    open var axisLineColor = NSUIColor.gray
-    open var axisLineWidth = CGFloat(0.5)
-    open var axisLineDashPhase = CGFloat(0.0)
-    open var axisLineDashLengths: [CGFloat]!
+    @objc open var axisLineColor = NSUIColor.gray
+    @objc open var axisLineWidth = CGFloat(0.5)
+    @objc open var axisLineDashPhase = CGFloat(0.0)
+    @objc open var axisLineDashLengths: [CGFloat]!
     
-    open var gridColor = NSUIColor.gray.withAlphaComponent(0.9)
-    open var gridLineWidth = CGFloat(0.5)
-    open var gridLineDashPhase = CGFloat(0.0)
-    open var gridLineDashLengths: [CGFloat]!
-    open var gridLineCap = CGLineCap.butt
+    @objc open var gridColor = NSUIColor.gray.withAlphaComponent(0.9)
+    @objc open var gridLineWidth = CGFloat(0.5)
+    @objc open var gridLineDashPhase = CGFloat(0.0)
+    @objc open var gridLineDashLengths: [CGFloat]!
+    @objc open var gridLineCap = CGLineCap.butt
     
-    open var drawGridLinesEnabled = true
-    open var drawAxisLineEnabled = true
+    @objc open var drawGridLinesEnabled = true
+    @objc open var drawAxisLineEnabled = true
     
     /// flag that indicates of the labels of this axis should be drawn or not
-    open var drawLabelsEnabled = true
+    @objc open var drawLabelsEnabled = true
     
-    fileprivate var _centerAxisLabelsEnabled = false
+    private var _centerAxisLabelsEnabled = false
 
     /// Centers the axis labels instead of drawing them at their original position.
     /// This is useful especially for grouped BarChart.
-    open var centerAxisLabelsEnabled: Bool
+    @objc open var centerAxisLabelsEnabled: Bool
     {
         get { return _centerAxisLabelsEnabled && entryCount > 0 }
         set { _centerAxisLabelsEnabled = newValue }
     }
     
-    open var isCenterAxisLabelsEnabled: Bool
+    @objc open var isCenterAxisLabelsEnabled: Bool
     {
         get { return centerAxisLabelsEnabled }
     }
 
     /// array of limitlines that can be set for the axis
-    fileprivate var _limitLines = [ChartLimitLine]()
+    private var _limitLines = [ChartLimitLine]()
     
     /// Are the LimitLines drawn behind the data or in front of the data?
-    /// 
+    ///
     /// **default**: false
-    open var drawLimitLinesBehindDataEnabled = false
+    @objc open var drawLimitLinesBehindDataEnabled = false
+    
+    /// Are the grid lines drawn behind the data or in front of the data?
+    ///
+    /// **default**: true
+    @objc open var drawGridLinesBehindDataEnabled = true
 
     /// the flag can be used to turn off the antialias for grid lines
-    open var gridAntialiasEnabled = true
+    @objc open var gridAntialiasEnabled = true
     
     /// the actual array of entries
-    open var entries = [Double]()
+    @objc open var entries = [Double]()
     
     /// axis label entries only used for centered labels
-    open var centeredEntries = [Double]()
+    @objc open var centeredEntries = [Double]()
     
     /// the number of entries the legend contains
-    open var entryCount: Int { return entries.count }
+    @objc open var entryCount: Int { return entries.count }
     
     /// the number of label entries the axis should have
     ///
     /// **default**: 6
-    fileprivate var _labelCount = Int(6)
+    private var _labelCount = Int(6)
     
     /// the number of decimal digits to use (for the default formatter
-    open var decimals: Int = 0
+    @objc open var decimals: Int = 0
     
     /// When true, axis labels are controlled by the `granularity` property.
     /// When false, axis values could possibly be repeated.
     /// This could happen if two adjacent axis values are rounded to same value.
     /// If using granularity this could be avoided by having fewer axis values visible.
-    open var granularityEnabled = false
+    @objc open var granularityEnabled = false
     
-    fileprivate var _granularity = Double(1.0)
+    private var _granularity = Double(1.0)
     
     /// The minimum interval between axis values.
     /// This can be used to avoid label duplicating when zooming in.
     ///
     /// **default**: 1.0
-    open var granularity: Double
+    @objc open var granularity: Double
     {
         get
         {
@@ -116,7 +120,7 @@ open class AxisBase: ComponentBase
     }
     
     /// The minimum interval between axis values.
-    open var isGranularityEnabled: Bool
+    @objc open var isGranularityEnabled: Bool
     {
         get
         {
@@ -125,9 +129,9 @@ open class AxisBase: ComponentBase
     }
     
     /// if true, the set number of y-labels will be forced
-    open var forceLabelsEnabled = false
+    @objc open var forceLabelsEnabled = false
     
-    open func getLongestLabel() -> String
+    @objc open func getLongestLabel() -> String
     {
         var longest = ""
         
@@ -135,7 +139,7 @@ open class AxisBase: ComponentBase
         {
             let text = getFormattedLabel(i)
             
-            if longest.characters.count < text.characters.count
+            if longest.count < text.count
             {
                 longest = text
             }
@@ -144,8 +148,8 @@ open class AxisBase: ComponentBase
         return longest
     }
     
-    /// - returns: The formatted label at the specified index. This will either use the auto-formatter or the custom formatter (if one is set).
-    open func getFormattedLabel(_ index: Int) -> String
+    /// - Returns: The formatted label at the specified index. This will either use the auto-formatter or the custom formatter (if one is set).
+    @objc open func getFormattedLabel(_ index: Int) -> String
     {
         if index < 0 || index >= entries.count
         {
@@ -158,7 +162,7 @@ open class AxisBase: ComponentBase
     /// Sets the formatter to be used for formatting the axis labels.
     /// If no formatter is set, the chart will automatically determine a reasonable formatting (concerning decimals) for all the values that are drawn inside the chart.
     /// Use `nil` to use the formatter calculated by the chart.
-    open var valueFormatter: IAxisValueFormatter?
+    @objc open var valueFormatter: IAxisValueFormatter?
     {
         get
         {
@@ -178,22 +182,27 @@ open class AxisBase: ComponentBase
         }
     }
     
-    open var isDrawGridLinesEnabled: Bool { return drawGridLinesEnabled }
+    @objc open var isDrawGridLinesEnabled: Bool { return drawGridLinesEnabled }
     
-    open var isDrawAxisLineEnabled: Bool { return drawAxisLineEnabled }
+    @objc open var isDrawAxisLineEnabled: Bool { return drawAxisLineEnabled }
     
-    open var isDrawLabelsEnabled: Bool { return drawLabelsEnabled }
+    @objc open var isDrawLabelsEnabled: Bool { return drawLabelsEnabled }
     
     /// Are the LimitLines drawn behind the data or in front of the data?
     /// 
     /// **default**: false
-    open var isDrawLimitLinesBehindDataEnabled: Bool { return drawLimitLinesBehindDataEnabled }
+    @objc open var isDrawLimitLinesBehindDataEnabled: Bool { return drawLimitLinesBehindDataEnabled }
+    
+    /// Are the grid lines drawn behind the data or in front of the data?
+    ///
+    /// **default**: true
+    @objc open var isDrawGridLinesBehindDataEnabled: Bool { return drawGridLinesBehindDataEnabled }
     
     /// Extra spacing for `axisMinimum` to be added to automatically calculated `axisMinimum`
-    open var spaceMin: Double = 0.0
+    @objc open var spaceMin: Double = 0.0
     
     /// Extra spacing for `axisMaximum` to be added to automatically calculated `axisMaximum`
-    open var spaceMax: Double = 0.0
+    @objc open var spaceMax: Double = 0.0
     
     /// Flag indicating that the axis-min value has been customized
     internal var _customAxisMin: Bool = false
@@ -212,14 +221,24 @@ open class AxisBase: ComponentBase
     internal var _axisMaximum = Double(0)
     
     /// the total range of values this axis covers
-    open var axisRange = Double(0)
+    @objc open var axisRange = Double(0)
+    
+    /// The minumum number of labels on the axis
+    @objc open var axisMinLabels = Int(2) {
+        didSet { axisMinLabels = axisMinLabels > 0 ? axisMinLabels : oldValue }
+    }
+    
+    /// The maximum number of labels on the axis
+    @objc open var axisMaxLabels = Int(25) {
+        didSet { axisMaxLabels = axisMaxLabels > 0 ? axisMaxLabels : oldValue }
+    }
     
     /// the number of label entries the axis should have
     /// max = 25,
     /// min = 2,
     /// default = 6,
     /// be aware that this number is not fixed and can only be approximated
-    open var labelCount: Int
+    @objc open var labelCount: Int
     {
         get
         {
@@ -227,57 +246,43 @@ open class AxisBase: ComponentBase
         }
         set
         {
-            _labelCount = newValue
-            
-            if _labelCount > 25
-            {
-                _labelCount = 25
-            }
-            if _labelCount < 2
-            {
-                _labelCount = 2
-            }
-            
+            let range = axisMinLabels...axisMaxLabels as ClosedRange
+            _labelCount = newValue.clamped(to: range)
+                        
             forceLabelsEnabled = false
         }
     }
     
-    open func setLabelCount(_ count: Int, force: Bool)
+    @objc open func setLabelCount(_ count: Int, force: Bool)
     {
         self.labelCount = count
         forceLabelsEnabled = force
     }
     
-    /// - returns: `true` if focing the y-label count is enabled. Default: false
-    open var isForceLabelsEnabled: Bool { return forceLabelsEnabled }
+    /// `true` if focing the y-label count is enabled. Default: false
+    @objc open var isForceLabelsEnabled: Bool { return forceLabelsEnabled }
     
     /// Adds a new ChartLimitLine to this axis.
-    open func addLimitLine(_ line: ChartLimitLine)
+    @objc open func addLimitLine(_ line: ChartLimitLine)
     {
         _limitLines.append(line)
     }
     
     /// Removes the specified ChartLimitLine from the axis.
-    open func removeLimitLine(_ line: ChartLimitLine)
+    @objc open func removeLimitLine(_ line: ChartLimitLine)
     {
-        for i in 0 ..< _limitLines.count
-        {
-            if _limitLines[i] === line
-            {
-                _limitLines.remove(at: i)
-                return
-            }
-        }
+        guard let i = _limitLines.firstIndex(of: line) else { return }
+        _limitLines.remove(at: i)
     }
     
     /// Removes all LimitLines from the axis.
-    open func removeAllLimitLines()
+    @objc open func removeAllLimitLines()
     {
         _limitLines.removeAll(keepingCapacity: false)
     }
     
-    /// - returns: The LimitLines of this axis.
-    open var limitLines : [ChartLimitLine]
+    /// The LimitLines of this axis.
+    @objc open var limitLines : [ChartLimitLine]
     {
         return _limitLines
     }
@@ -285,41 +290,25 @@ open class AxisBase: ComponentBase
     // MARK: Custom axis ranges
     
     /// By calling this method, any custom minimum value that has been previously set is reseted, and the calculation is done automatically.
-    open func resetCustomAxisMin()
+    @objc open func resetCustomAxisMin()
     {
         _customAxisMin = false
     }
     
-    open var isAxisMinCustom: Bool { return _customAxisMin }
+    @objc open var isAxisMinCustom: Bool { return _customAxisMin }
     
     /// By calling this method, any custom maximum value that has been previously set is reseted, and the calculation is done automatically.
-    open func resetCustomAxisMax()
+    @objc open func resetCustomAxisMax()
     {
         _customAxisMax = false
     }
     
-    open var isAxisMaxCustom: Bool { return _customAxisMax }
-    
-    /// This property is deprecated - Use `axisMinimum` instead.
-    @available(*, deprecated: 1.0, message: "Use axisMinimum instead.")
-    open var axisMinValue: Double
-    {
-        get { return axisMinimum }
-        set { axisMinimum = newValue }
-    }
-    
-    /// This property is deprecated - Use `axisMaximum` instead.
-    @available(*, deprecated: 1.0, message: "Use axisMaximum instead.")
-    open var axisMaxValue: Double
-    {
-        get { return axisMaximum }
-        set { axisMaximum = newValue }
-    }
-    
+    @objc open var isAxisMaxCustom: Bool { return _customAxisMax }
+        
     /// The minimum value for this axis.
     /// If set, this value will not be calculated automatically depending on the provided data.
     /// Use `resetCustomAxisMin()` to undo this.
-    open var axisMinimum: Double
+    @objc open var axisMinimum: Double
     {
         get
         {
@@ -336,7 +325,7 @@ open class AxisBase: ComponentBase
     /// The maximum value for this axis.
     /// If set, this value will not be calculated automatically depending on the provided data.
     /// Use `resetCustomAxisMax()` to undo this.
-    open var axisMaximum: Double
+    @objc open var axisMaximum: Double
     {
         get
         {
@@ -351,9 +340,11 @@ open class AxisBase: ComponentBase
     }
     
     /// Calculates the minimum, maximum and range values of the YAxis with the given minimum and maximum values from the chart data.
-    /// - parameter dataMin: the y-min value according to chart data
-    /// - parameter dataMax: the y-max value according to chart
-    open func calculate(min dataMin: Double, max dataMax: Double)
+    ///
+    /// - Parameters:
+    ///   - dataMin: the y-min value according to chart data
+    ///   - dataMax: the y-max value according to chart
+    @objc open func calculate(min dataMin: Double, max dataMax: Double)
     {
         // if custom, use value as is, else use data value
         var min = _customAxisMin ? _axisMinimum : (dataMin - spaceMin)
diff --git a/Source/Charts/Components/ChartLimitLine.swift b/Source/Charts/Components/ChartLimitLine.swift
index f4aaef406a..407c7cd4cc 100644
--- a/Source/Charts/Components/ChartLimitLine.swift
+++ b/Source/Charts/Components/ChartLimitLine.swift
@@ -20,39 +20,39 @@ open class ChartLimitLine: ComponentBase
     @objc(ChartLimitLabelPosition)
     public enum LabelPosition: Int
     {
-        case leftTop
-        case leftBottom
-        case rightTop
-        case rightBottom
+        case topLeft
+        case topRight
+        case bottomLeft
+        case bottomRight
     }
     
     /// limit / maximum (the y-value or xIndex)
-    open var limit = Double(0.0)
+    @objc open var limit = Double(0.0)
     
-    fileprivate var _lineWidth = CGFloat(2.0)
-    open var lineColor = NSUIColor(red: 237.0/255.0, green: 91.0/255.0, blue: 91.0/255.0, alpha: 1.0)
-    open var lineDashPhase = CGFloat(0.0)
-    open var lineDashLengths: [CGFloat]?
+    private var _lineWidth = CGFloat(2.0)
+    @objc open var lineColor = NSUIColor(red: 237.0/255.0, green: 91.0/255.0, blue: 91.0/255.0, alpha: 1.0)
+    @objc open var lineDashPhase = CGFloat(0.0)
+    @objc open var lineDashLengths: [CGFloat]?
     
-    open var valueTextColor = NSUIColor.black
-    open var valueFont = NSUIFont.systemFont(ofSize: 13.0)
+    @objc open var valueTextColor = NSUIColor.labelOrBlack
+    @objc open var valueFont = NSUIFont.systemFont(ofSize: 13.0)
     
-    open var drawLabelEnabled = true
-    open var label = ""
-    open var labelPosition = LabelPosition.rightTop
+    @objc open var drawLabelEnabled = true
+    @objc open var label = ""
+    @objc open var labelPosition = LabelPosition.topRight
     
     public override init()
     {
         super.init()
     }
     
-    public init(limit: Double)
+    @objc public init(limit: Double)
     {
         super.init()
         self.limit = limit
     }
     
-    public init(limit: Double, label: String)
+    @objc public init(limit: Double, label: String)
     {
         super.init()
         self.limit = limit
@@ -60,7 +60,7 @@ open class ChartLimitLine: ComponentBase
     }
     
     /// set the line width of the chart (min = 0.2, max = 12); default 2
-    open var lineWidth: CGFloat
+    @objc open var lineWidth: CGFloat
     {
         get
         {
@@ -68,18 +68,7 @@ open class ChartLimitLine: ComponentBase
         }
         set
         {
-            if newValue < 0.2
-            {
-                _lineWidth = 0.2
-            }
-            else if newValue > 12.0
-            {
-                _lineWidth = 12.0
-            }
-            else
-            {
-                _lineWidth = newValue
-            }
+            _lineWidth = newValue.clamped(to: 0.2...12)
         }
     }
 }
diff --git a/Source/Charts/Components/ComponentBase.swift b/Source/Charts/Components/ComponentBase.swift
index d8f93e4bb1..6014a17561 100644
--- a/Source/Charts/Components/ComponentBase.swift
+++ b/Source/Charts/Components/ComponentBase.swift
@@ -18,20 +18,20 @@ import CoreGraphics
 open class ComponentBase: NSObject
 {
     /// flag that indicates if this component is enabled or not
-    open var enabled = true
+    @objc open var enabled = true
     
     /// The offset this component has on the x-axis
     /// **default**: 5.0
-    open var xOffset = CGFloat(5.0)
+    @objc open var xOffset = CGFloat(5.0)
     
     /// The offset this component has on the x-axis
     /// **default**: 5.0 (or 0.0 on ChartYAxis)
-    open var yOffset = CGFloat(5.0)
+    @objc open var yOffset = CGFloat(5.0)
     
     public override init()
     {
         super.init()
     }
 
-    open var isEnabled: Bool { return enabled }
+    @objc open var isEnabled: Bool { return enabled }
 }
diff --git a/Source/Charts/Components/Description.swift b/Source/Charts/Components/Description.swift
index 67bdd509a1..0288931c04 100644
--- a/Source/Charts/Components/Description.swift
+++ b/Source/Charts/Components/Description.swift
@@ -12,35 +12,43 @@
 import Foundation
 import CoreGraphics
 
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 @objc(ChartDescription)
 open class Description: ComponentBase
 {
     public override init()
     {
         #if os(tvOS)
-            // 23 is the smallest recommended font size on the TV
-            font = NSUIFont.systemFont(ofSize: 23)
+        // 23 is the smallest recommended font size on the TV
+        font = .systemFont(ofSize: 23)
         #elseif os(OSX)
-            font = NSUIFont.systemFont(ofSize: NSUIFont.systemFontSize())
+        font = .systemFont(ofSize: NSUIFont.systemFontSize)
         #else
-            font = NSUIFont.systemFont(ofSize: 8.0)
+        font = .systemFont(ofSize: 8.0)
         #endif
         
         super.init()
     }
     
     /// The text to be shown as the description.
-    open var text: String? = "Description Label"
+    @objc open var text: String?
     
     /// Custom position for the description text in pixels on the screen.
     open var position: CGPoint? = nil
     
     /// The text alignment of the description text. Default RIGHT.
-    open var textAlign: NSTextAlignment = NSTextAlignment.right
+    @objc open var textAlign: NSTextAlignment = NSTextAlignment.right
     
     /// Font object used for drawing the description text.
-    open var font: NSUIFont
+    @objc open var font: NSUIFont
     
     /// Text color used for drawing the description text
-    open var textColor = NSUIColor.black
+    @objc open var textColor = NSUIColor.labelOrBlack
 }
diff --git a/Source/Charts/Components/IMarker.swift b/Source/Charts/Components/IMarker.swift
index b11d627ee3..a4b7526098 100644
--- a/Source/Charts/Components/IMarker.swift
+++ b/Source/Charts/Components/IMarker.swift
@@ -13,26 +13,25 @@ import Foundation
 import CoreGraphics
 
 @objc(IChartMarker)
-public protocol IMarker: NSObjectProtocol
+public protocol IMarker: class
 {
-    /// - returns: The desired (general) offset you wish the IMarker to have on the x-axis.
-    ///
+    /// - Returns: The desired (general) offset you wish the IMarker to have on the x-axis.
     /// By returning x: -(width / 2) you will center the IMarker horizontally.
-    ///
     /// By returning y: -(height / 2) you will center the IMarker vertically.
     var offset: CGPoint { get }
     
-    /// - returns: The offset for drawing at the specific `point`.
+    /// - Parameters:
+    ///   - point: This is the point at which the marker wants to be drawn. You can adjust the offset conditionally based on this argument.
+    /// - Returns: The offset for drawing at the specific `point`.
     ///            This allows conditional adjusting of the Marker position.
     ///            If you have no adjustments to make, return self.offset().
-    ///
-    /// - parameter point: This is the point at which the marker wants to be drawn. You can adjust the offset conditionally based on this argument.
     func offsetForDrawing(atPoint: CGPoint) -> CGPoint
     
     /// This method enables a custom IMarker to update it's content every time the IMarker is redrawn according to the data entry it points to.
     ///
-    /// - parameter entry: The Entry the IMarker belongs to. This can also be any subclass of Entry, like BarEntry or CandleEntry, simply cast it at runtime.
-    /// - parameter highlight: The highlight object contains information about the highlighted value such as it's dataset-index, the selected range or stack-index (only stacked bar entries).
+    /// - Parameters:
+    ///   - entry: The Entry the IMarker belongs to. This can also be any subclass of Entry, like BarEntry or CandleEntry, simply cast it at runtime.
+    ///   - highlight: The highlight object contains information about the highlighted value such as it's dataset-index, the selected range or stack-index (only stacked bar entries).
     func refreshContent(entry: ChartDataEntry, highlight: Highlight)
     
     /// Draws the IMarker on the given position on the given context
diff --git a/Source/Charts/Components/Legend.swift b/Source/Charts/Components/Legend.swift
index e50e76c117..2a92f4ebaa 100644
--- a/Source/Charts/Components/Legend.swift
+++ b/Source/Charts/Components/Legend.swift
@@ -12,33 +12,9 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 @objc(ChartLegend)
 open class Legend: ComponentBase
 {
-    /// This property is deprecated - Use `horizontalAlignment`, `verticalAlignment`, `orientation`, `drawInside`, `direction`.
-    @available(*, deprecated: 1.0, message: "Use `horizontalAlignment`, `verticalAlignment`, `orientation`, `drawInside`, `direction`.")
-    @objc(ChartLegendPosition)
-    public enum Position: Int
-    {
-        case rightOfChart
-        case rightOfChartCenter
-        case rightOfChartInside
-        case leftOfChart
-        case leftOfChartCenter
-        case leftOfChartInside
-        case belowChartLeft
-        case belowChartRight
-        case belowChartCenter
-        case aboveChartLeft
-        case aboveChartRight
-        case aboveChartCenter
-        case piechartCenter
-    }
-    
     @objc(ChartLegendForm)
     public enum Form: Int
     {
@@ -92,142 +68,67 @@ open class Legend: ComponentBase
     }
     
     /// The legend entries array
-    open var entries = [LegendEntry]()
+    @objc open var entries = [LegendEntry]()
     
     /// Entries that will be appended to the end of the auto calculated entries after calculating the legend.
     /// (if the legend has already been calculated, you will need to call notifyDataSetChanged() to let the changes take effect)
-    open var extraEntries = [LegendEntry]()
+    @objc open var extraEntries = [LegendEntry]()
     
     /// Are the legend labels/colors a custom value or auto calculated? If false, then it's auto, if true, then custom.
     /// 
     /// **default**: false (automatic legend)
-    fileprivate var _isLegendCustom = false
-    
-    /// This property is deprecated - Use `horizontalAlignment`, `verticalAlignment`, `orientation`, `drawInside`, `direction`.
-    @available(*, deprecated: 1.0, message: "Use `horizontalAlignment`, `verticalAlignment`, `orientation`, `drawInside`, `direction`.")
-    open var position: Position
-    {
-        get
-        {
-            if orientation == .vertical && horizontalAlignment == .center && verticalAlignment == .center
-            {
-                return .piechartCenter
-            }
-            else if orientation == .horizontal
-            {
-                if verticalAlignment == .top
-                {
-                    return horizontalAlignment == .left ? .aboveChartLeft : (horizontalAlignment == .right ? .aboveChartRight : .aboveChartCenter)
-                }
-                else
-                {
-                    return horizontalAlignment == .left ? .belowChartLeft : (horizontalAlignment == .right ? .belowChartRight : .belowChartCenter)
-                }
-            }
-            else
-            {
-                if horizontalAlignment == .left
-                {
-                    return verticalAlignment == .top && drawInside ? .leftOfChartInside : (verticalAlignment == .center ? .leftOfChartCenter : .leftOfChart)
-                }
-                else
-                {
-                    return verticalAlignment == .top && drawInside ? .rightOfChartInside : (verticalAlignment == .center ? .rightOfChartCenter : .rightOfChart)
-                }
-            }
-        }
-        set
-        {
-            switch newValue
-            {
-            case .leftOfChart: fallthrough
-            case .leftOfChartInside: fallthrough
-            case .leftOfChartCenter:
-                horizontalAlignment = .left
-                verticalAlignment = newValue == .leftOfChartCenter ? .center : .top
-                orientation = .vertical
-                
-            case .rightOfChart: fallthrough
-            case .rightOfChartInside: fallthrough
-            case .rightOfChartCenter:
-                horizontalAlignment = .right
-                verticalAlignment = newValue == .rightOfChartCenter ? .center : .top
-                orientation = .vertical
-                
-            case .aboveChartLeft: fallthrough
-            case .aboveChartCenter: fallthrough
-            case .aboveChartRight:
-                horizontalAlignment = newValue == .aboveChartLeft ? .left : (newValue == .aboveChartRight ? .right : .center)
-                verticalAlignment = .top
-                orientation = .horizontal
-                
-            case .belowChartLeft: fallthrough
-            case .belowChartCenter: fallthrough
-            case .belowChartRight:
-                horizontalAlignment = newValue == .belowChartLeft ? .left : (newValue == .belowChartRight ? .right : .center)
-                verticalAlignment = .bottom
-                orientation = .horizontal
-                
-            case .piechartCenter:
-                horizontalAlignment = .center
-                verticalAlignment = .center
-                orientation = .vertical
-            }
-            
-            drawInside = newValue == .leftOfChartInside || newValue == .rightOfChartInside
-        }
-    }
-    
+    private var _isLegendCustom = false
+
     /// The horizontal alignment of the legend
-    open var horizontalAlignment: HorizontalAlignment = HorizontalAlignment.left
+    @objc open var horizontalAlignment: HorizontalAlignment = HorizontalAlignment.left
     
     /// The vertical alignment of the legend
-    open var verticalAlignment: VerticalAlignment = VerticalAlignment.bottom
+    @objc open var verticalAlignment: VerticalAlignment = VerticalAlignment.bottom
     
     /// The orientation of the legend
-    open var orientation: Orientation = Orientation.horizontal
+    @objc open var orientation: Orientation = Orientation.horizontal
     
     /// Flag indicating whether the legend will draw inside the chart or outside
-    open var drawInside: Bool = false
+    @objc open var drawInside: Bool = false
     
     /// Flag indicating whether the legend will draw inside the chart or outside
-    open var isDrawInsideEnabled: Bool { return drawInside }
+    @objc open var isDrawInsideEnabled: Bool { return drawInside }
     
     /// The text direction of the legend
-    open var direction: Direction = Direction.leftToRight
+    @objc open var direction: Direction = Direction.leftToRight
 
-    open var font: NSUIFont = NSUIFont.systemFont(ofSize: 10.0)
-    open var textColor = NSUIColor.black
+    @objc open var font: NSUIFont = NSUIFont.systemFont(ofSize: 10.0)
+    @objc open var textColor = NSUIColor.labelOrBlack
 
     /// The form/shape of the legend forms
-    open var form = Form.square
+    @objc open var form = Form.square
     
     /// The size of the legend forms
-    open var formSize = CGFloat(8.0)
+    @objc open var formSize = CGFloat(8.0)
     
     /// The line width for forms that consist of lines
-    open var formLineWidth = CGFloat(3.0)
+    @objc open var formLineWidth = CGFloat(3.0)
     
     /// Line dash configuration for shapes that consist of lines.
     ///
     /// This is how much (in pixels) into the dash pattern are we starting from.
-    open var formLineDashPhase: CGFloat = 0.0
+    @objc open var formLineDashPhase: CGFloat = 0.0
     
     /// Line dash configuration for shapes that consist of lines.
     ///
     /// This is the actual dash pattern.
     /// I.e. [2, 3] will paint [--   --   ]
     /// [1, 3, 4, 2] will paint [-   ----  -   ----  ]
-    open var formLineDashLengths: [CGFloat]?
+    @objc open var formLineDashLengths: [CGFloat]?
     
-    open var xEntrySpace = CGFloat(6.0)
-    open var yEntrySpace = CGFloat(0.0)
-    open var formToTextSpace = CGFloat(5.0)
-    open var stackSpace = CGFloat(3.0)
+    @objc open var xEntrySpace = CGFloat(6.0)
+    @objc open var yEntrySpace = CGFloat(0.0)
+    @objc open var formToTextSpace = CGFloat(5.0)
+    @objc open var stackSpace = CGFloat(3.0)
     
-    open var calculatedLabelSizes = [CGSize]()
-    open var calculatedLabelBreakPoints = [Bool]()
-    open var calculatedLineSizes = [CGSize]()
+    @objc open var calculatedLabelSizes = [CGSize]()
+    @objc open var calculatedLabelBreakPoints = [Bool]()
+    @objc open var calculatedLineSizes = [CGSize]()
     
     public override init()
     {
@@ -237,14 +138,14 @@ open class Legend: ComponentBase
         self.yOffset = 3.0
     }
     
-    public init(entries: [LegendEntry])
+    @objc public init(entries: [LegendEntry])
     {
         super.init()
         
         self.entries = entries
     }
     
-    open func getMaximumEntrySize(withFont font: NSUIFont) -> CGSize
+    @objc open func getMaximumEntrySize(withFont font: NSUIFont) -> CGSize
     {
         var maxW = CGFloat(0.0)
         var maxH = CGFloat(0.0)
@@ -262,7 +163,7 @@ open class Legend: ComponentBase
             guard let label = entry.label
                 else { continue }
             
-            let size = (label as NSString!).size(attributes: [NSFontAttributeName: font])
+            let size = (label as NSString).size(withAttributes: [.font: font])
             
             if size.width > maxW
             {
@@ -280,29 +181,29 @@ open class Legend: ComponentBase
         )
     }
 
-    open var neededWidth = CGFloat(0.0)
-    open var neededHeight = CGFloat(0.0)
-    open var textWidthMax = CGFloat(0.0)
-    open var textHeightMax = CGFloat(0.0)
+    @objc open var neededWidth = CGFloat(0.0)
+    @objc open var neededHeight = CGFloat(0.0)
+    @objc open var textWidthMax = CGFloat(0.0)
+    @objc open var textHeightMax = CGFloat(0.0)
     
     /// flag that indicates if word wrapping is enabled
     /// this is currently supported only for `orientation == Horizontal`.
     /// you may want to set maxSizePercent when word wrapping, to set the point where the text wraps.
     /// 
     /// **default**: true
-    open var wordWrapEnabled = true
+    @objc open var wordWrapEnabled = true
     
     /// if this is set, then word wrapping the legend is enabled.
-    open var isWordWrapEnabled: Bool { return wordWrapEnabled }
+    @objc open var isWordWrapEnabled: Bool { return wordWrapEnabled }
 
     /// The maximum relative size out of the whole chart view in percent.
     /// If the legend is to the right/left of the chart, then this affects the width of the legend.
     /// If the legend is to the top/bottom of the chart, then this affects the height of the legend.
     /// 
     /// **default**: 0.95 (95%)
-    open var maxSizePercent: CGFloat = 0.95
+    @objc open var maxSizePercent: CGFloat = 0.95
     
-    open func calculateDimensions(labelFont: NSUIFont, viewPortHandler: ViewPortHandler)
+    @objc open func calculateDimensions(labelFont: NSUIFont, viewPortHandler: ViewPortHandler)
     {
         let maxEntrySize = getMaximumEntrySize(withFont: labelFont)
         let defaultFormSize = self.formSize
@@ -351,7 +252,7 @@ open class Legend: ComponentBase
                 
                 if label != nil
                 {
-                    let size = (label as NSString!).size(attributes: [NSFontAttributeName: labelFont])
+                    let size = (label! as NSString).size(withAttributes: [.font: labelFont])
                     
                     if drawingForm && !wasStacked
                     {
@@ -366,11 +267,7 @@ open class Legend: ComponentBase
                     }
                     
                     width += size.width
-                    
-                    if i < entryCount - 1
-                    {
-                        maxHeight += labelLineHeight + yEntrySpace
-                    }
+                    maxHeight += labelLineHeight + yEntrySpace
                 }
                 else
                 {
@@ -410,7 +307,7 @@ open class Legend: ComponentBase
             
             // Start calculating layout
             
-            let labelAttrs = [NSFontAttributeName: labelFont]
+            let labelAttrs = [NSAttributedString.Key.font: labelFont]
             var maxLineWidth: CGFloat = 0.0
             var currentLineWidth: CGFloat = 0.0
             var requiredWidth: CGFloat = 0.0
@@ -438,7 +335,7 @@ open class Legend: ComponentBase
                 // grouped forms have null labels
                 if label != nil
                 {
-                    calculatedLabelSizes[i] = (label as NSString!).size(attributes: labelAttrs)
+                    calculatedLabelSizes[i] = (label! as NSString).size(withAttributes: labelAttrs)
                     requiredWidth += drawingForm ? formToTextSpace + formSize : 0.0
                     requiredWidth += calculatedLabelSizes[i].width
                 }
@@ -502,358 +399,22 @@ open class Legend: ComponentBase
     /// * A nil label will start a group.
     /// This will disable the feature that automatically calculates the legend entries from the datasets.
     /// Call `resetCustom(...)` to re-enable automatic calculation (and then `notifyDataSetChanged()` is needed).
-    open func setCustom(entries: [LegendEntry])
+    @objc open func setCustom(entries: [LegendEntry])
     {
         self.entries = entries
         _isLegendCustom = true
     }
     
     /// Calling this will disable the custom legend entries (set by `setLegend(...)`). Instead, the entries will again be calculated automatically (after `notifyDataSetChanged()` is called).
-    open func resetCustom()
+    @objc open func resetCustom()
     {
         _isLegendCustom = false
     }
     
     /// **default**: false (automatic legend)
-    /// - returns: `true` if a custom legend entries has been set
-    open var isLegendCustom: Bool
+    /// `true` if a custom legend entries has been set
+    @objc open var isLegendCustom: Bool
     {
         return _isLegendCustom
     }
-    
-    // MARK: - Deprecated stuff
-    
-    /// This property is deprecated - Use `entries`.
-    @available(*, deprecated: 1.0, message: "Use `entries`.")
-    open var colors: [NSUIColor?]
-    {
-        get
-        {
-            var old = [NSUIColor?]()
-            for e in entries
-            {
-                old.append(
-                    e.form == .none ? nil :
-                        (e.form == .empty ? NSUIColor.clear :
-                        e.formColor))
-            }
-            return old
-        }
-        set
-        {
-            for i in 0 ..< newValue.count
-            {
-                if entries.count <= i
-                {
-                    entries.append(LegendEntry())
-                }
-                entries[i].formColor = newValue[i]
-                
-                if newValue[i] == nil
-                {
-                    entries[i].form = .none
-                }
-                else if newValue[i] == NSUIColor.clear
-                {
-                    entries[i].form = .empty
-                }
-            }
-        }
-    }
-    
-    /// This property is deprecated - Use `entries`.
-    @available(*, deprecated: 1.0, message: "Use `entries`.")
-    open var labels: [String?]
-    {
-        get
-        {
-            var old = [String?]()
-            for e in entries
-            {
-                old.append(e.label)
-            }
-            return old
-        }
-        set
-        {
-            for i in 0 ..< newValue.count
-            {
-                if entries.count <= i
-                {
-                    entries.append(LegendEntry())
-                }
-                entries[i].label = newValue[i]
-            }
-        }
-    }
-    
-    
-    /// This property is deprecated - Use `extraEntries`.
-    @available(*, deprecated: 1.0, message: "Use `extraEntries`.")
-    open var extraColors: [NSUIColor?]
-    {
-        get
-        {
-            var old = [NSUIColor?]()
-            for e in extraEntries
-            {
-                old.append(
-                    e.form == .none ? nil :
-                        (e.form == .empty ? NSUIColor.clear :
-                            e.formColor))
-            }
-            return old
-        }
-        set
-        {
-            if extraEntries.count > newValue.count
-            {
-                extraEntries.removeSubrange(newValue.count ..< extraEntries.count)
-            }
-            
-            for i in 0 ..< newValue.count
-            {
-                extraEntries[i].formColor = newValue[i]
-                
-                if newValue[i] == nil
-                {
-                    extraEntries[i].form = .none
-                }
-                else if newValue[i] == NSUIColor.clear
-                {
-                    extraEntries[i].form = .empty
-                }
-            }
-        }
-    }
-    
-    /// This property is deprecated - Use `extraEntries`.
-    @available(*, deprecated: 1.0, message: "Use `extraEntries`.")
-    open var extraLabels: [String?]
-    {
-        get
-        {
-            var old = [String?]()
-            for e in extraEntries
-            {
-                old.append(e.label)
-            }
-            return old
-        }
-        set
-        {
-            if extraEntries.count > newValue.count
-            {
-                extraEntries.removeSubrange(newValue.count ..< extraEntries.count)
-            }
-            
-            for i in 0 ..< newValue.count
-            {
-                extraEntries[i].label = newValue[i]
-            }
-        }
-    }
-    
-    /// This constructor is deprecated - Use `init(entries:)`
-    @available(*, deprecated: 1.0, message: "Use `init(entries:)`")
-    public init(colors: [NSUIColor?], labels: [String?])
-    {
-        super.init()
-        
-        var entries = [LegendEntry]()
-        
-        for i in 0 ..< min(colors.count, labels.count)
-        {
-            let entry = LegendEntry()
-            entry.formColor = colors[i]
-            entry.label = labels[i]
-            
-            if entry.formColor == nil
-            {
-                entry.form = .none
-            }
-            else if entry.formColor == NSUIColor.clear
-            {
-                entry.form = .empty
-            }
-            
-            entries.append(entry)
-        }
-        
-        self.entries = entries
-    }
-    
-    /// This constructor is deprecated - Use `init(entries:)`
-    @available(*, deprecated: 1.0, message: "Use `init(entries:)`")
-    public init(colors: [NSObject], labels: [NSObject])
-    {
-        super.init()
-        
-        var entries = [LegendEntry]()
-        
-        for i in 0 ..< min(colors.count, labels.count)
-        {
-            let entry = LegendEntry()
-            entry.formColor = colors[i] as? NSUIColor
-            entry.label = labels[i] as? String
-            
-            if entry.formColor == nil
-            {
-                entry.form = .none
-            }
-            else if entry.formColor == NSUIColor.clear
-            {
-                entry.form = .empty
-            }
-            
-            entries.append(entry)
-        }
-        
-        self.entries = entries
-    }
-    
-    /// This property is deprecated - Use `extraEntries`
-    @available(*, deprecated: 1.0, message: "Use `extraEntries`")
-    open var extraColorsObjc: [NSObject]
-    {
-        return ChartUtils.bridgedObjCGetNSUIColorArray(swift: extraColors)
-    }
-    
-    /// This property is deprecated - Use `extraLabels`
-    @available(*, deprecated: 1.0, message: "Use `extraLabels`")
-    open var extraLabelsObjc: [NSObject]
-    {
-        return ChartUtils.bridgedObjCGetStringArray(swift: extraLabels)
-    }
-    
-    /// This property is deprecated - Use `colors`
-    @available(*, deprecated: 1.0, message: "Use `colors`")
-    open var colorsObjc: [NSObject]
-    {
-        get { return ChartUtils.bridgedObjCGetNSUIColorArray(swift: colors) }
-        set { self.colors = ChartUtils.bridgedObjCGetNSUIColorArray(objc: newValue) }
-    }
-    
-    /// This property is deprecated - Use `labels`
-    @available(*, deprecated: 1.0, message: "Use `labels`")
-    open var labelsObjc: [NSObject]
-    {
-        get { return ChartUtils.bridgedObjCGetStringArray(swift: labels) }
-        set { self.labels = ChartUtils.bridgedObjCGetStringArray(objc: newValue) }
-    }
-    
-    /// This function is deprecated - Use `entries`
-    @available(*, deprecated: 1.0, message: "Use `entries`")
-    open func getLabel(_ index: Int) -> String?
-    {
-        return entries[index].label
-    }
-    
-    /// This function is deprecated - Use `Use `extra(entries:)`
-    @available(*, deprecated: 1.0, message: "Use `extra(entries:)`")
-    open func setExtra(colors: [NSUIColor?], labels: [String?])
-    {
-        var entries = [LegendEntry]()
-        
-        for i in 0 ..< min(colors.count, labels.count)
-        {
-            let entry = LegendEntry()
-            entry.formColor = colors[i]
-            entry.label = labels[i]
-            
-            if entry.formColor == nil
-            {
-                entry.form = .none
-            }
-            else if entry.formColor == NSUIColor.clear
-            {
-                entry.form = .empty
-            }
-            
-            entries.append(entry)
-        }
-        
-        self.extraEntries = entries
-    }
-    
-    /// This function is deprecated - Use `Use `extra(entries:)`
-    @available(*, deprecated: 1.0, message: "Use `extra(entries:)`")
-    open func setExtra(colors: [NSObject], labels: [NSObject])
-    {
-        var entries = [LegendEntry]()
-        
-        for i in 0 ..< min(colors.count, labels.count)
-        {
-            let entry = LegendEntry()
-            entry.formColor = colors[i] as? NSUIColor
-            entry.label = labels[i] as? String
-            
-            if entry.formColor == nil
-            {
-                entry.form = .none
-            }
-            else if entry.formColor == NSUIColor.clear
-            {
-                entry.form = .empty
-            }
-            
-            entries.append(entry)
-        }
-        
-        self.extraEntries = entries
-    }
-    
-    /// This function is deprecated - Use `Use `setCustom(entries:)`
-    @available(*, deprecated: 1.0, message: "Use `setCustom(entries:)`")
-    open func setCustom(colors: [NSUIColor?], labels: [String?])
-    {
-        var entries = [LegendEntry]()
-        
-        for i in 0 ..< min(colors.count, labels.count)
-        {
-            let entry = LegendEntry()
-            entry.formColor = colors[i]
-            entry.label = labels[i]
-            
-            if entry.formColor == nil
-            {
-                entry.form = .none
-            }
-            else if entry.formColor == NSUIColor.clear
-            {
-                entry.form = .empty
-            }
-            
-            entries.append(entry)
-        }
-        
-        setCustom(entries: entries)
-    }
-    
-    /// This function is deprecated - Use `Use `setCustom(entries:)`
-    @available(*, deprecated: 1.0, message: "Use `setCustom(entries:)`")
-    open func setCustom(colors: [NSObject], labels: [NSObject])
-    {
-        var entries = [LegendEntry]()
-        
-        for i in 0 ..< min(colors.count, labels.count)
-        {
-            let entry = LegendEntry()
-            entry.formColor = colors[i] as? NSUIColor
-            entry.label = labels[i] as? String
-            
-            if entry.formColor == nil
-            {
-                entry.form = .none
-            }
-            else if entry.formColor == NSUIColor.clear
-            {
-                entry.form = .empty
-            }
-            
-            entries.append(entry)
-        }
-        
-        setCustom(entries: entries)
-    }
 }
diff --git a/Source/Charts/Components/LegendEntry.swift b/Source/Charts/Components/LegendEntry.swift
index a9da5bd02a..5868137ef9 100644
--- a/Source/Charts/Components/LegendEntry.swift
+++ b/Source/Charts/Components/LegendEntry.swift
@@ -12,10 +12,6 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 @objc(ChartLegendEntry)
 open class LegendEntry: NSObject
 {
@@ -24,15 +20,16 @@ open class LegendEntry: NSObject
         super.init()
     }
     
-    /// - parameter label:                  The legend entry text.
+    /// - Parameters:
+    ///   - label:                  The legend entry text.
     ///                                     A `nil` label will start a group.
-    /// - parameter form:                   The form to draw for this entry.
-    /// - parameter formSize:               Set to NaN to use the legend's default.
-    /// - parameter formLineWidth:          Set to NaN to use the legend's default.
-    /// - parameter formLineDashPhase:      Line dash configuration.
-    /// - parameter formLineDashLengths:    Line dash configurationas NaN to use the legend's default.
-    /// - parameter formColor:              The color for drawing the form.
-    public init(label: String?,
+    ///   - form:                   The form to draw for this entry.
+    ///   - formSize:               Set to NaN to use the legend's default.
+    ///   - formLineWidth:          Set to NaN to use the legend's default.
+    ///   - formLineDashPhase:      Line dash configuration.
+    ///   - formLineDashLengths:    Line dash configurationas NaN to use the legend's default.
+    ///   - formColor:              The color for drawing the form.
+    @objc public init(label: String?,
                 form: Legend.Form,
                 formSize: CGFloat,
                 formLineWidth: CGFloat,
@@ -51,31 +48,31 @@ open class LegendEntry: NSObject
     
     /// The legend entry text.
     /// A `nil` label will start a group.
-    open var label: String?
+    @objc open var label: String?
     
     /// The form to draw for this entry.
     ///
     /// `None` will avoid drawing a form, and any related space.
     /// `Empty` will avoid drawing a form, but keep its space.
     /// `Default` will use the Legend's default.
-    open var form: Legend.Form = .default
+    @objc open var form: Legend.Form = .default
     
     /// Form size will be considered except for when .None is used
     ///
     /// Set as NaN to use the legend's default
-    open var formSize: CGFloat = CGFloat.nan
+    @objc open var formSize: CGFloat = CGFloat.nan
     
     /// Line width used for shapes that consist of lines.
     ///
     /// Set to NaN to use the legend's default.
-    open var formLineWidth: CGFloat = CGFloat.nan
+    @objc open var formLineWidth: CGFloat = CGFloat.nan
     
     /// Line dash configuration for shapes that consist of lines.
     ///
     /// This is how much (in pixels) into the dash pattern are we starting from.
     ///
     /// Set to NaN to use the legend's default.
-    open var formLineDashPhase: CGFloat = 0.0
+    @objc open var formLineDashPhase: CGFloat = 0.0
     
     /// Line dash configuration for shapes that consist of lines.
     ///
@@ -84,8 +81,8 @@ open class LegendEntry: NSObject
     /// [1, 3, 4, 2] will paint [-   ----  -   ----  ]
     ///
     /// Set to nil to use the legend's default.
-    open var formLineDashLengths: [CGFloat]?
+    @objc open var formLineDashLengths: [CGFloat]?
     
     /// The color for drawing the form
-    open var formColor: NSUIColor?
+    @objc open var formColor: NSUIColor?
 }
diff --git a/Source/Charts/Components/MarkerImage.swift b/Source/Charts/Components/MarkerImage.swift
index 3b7194b9cc..341b1186c0 100644
--- a/Source/Charts/Components/MarkerImage.swift
+++ b/Source/Charts/Components/MarkerImage.swift
@@ -12,22 +12,18 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 @objc(ChartMarkerImage)
 open class MarkerImage: NSObject, IMarker
 {
     /// The marker image to render
-    open var image: NSUIImage?
+    @objc open var image: NSUIImage?
     
     open var offset: CGPoint = CGPoint()
     
-    open weak var chartView: ChartViewBase?
+    @objc open weak var chartView: ChartViewBase?
     
     /// As long as size is 0.0/0.0 - it will default to the image's size
-    open var size: CGSize = CGSize()
+    @objc open var size: CGSize = CGSize()
     
     public override init()
     {
@@ -82,17 +78,19 @@ open class MarkerImage: NSObject, IMarker
     
     open func draw(context: CGContext, point: CGPoint)
     {
-        let offset = self.offsetForDrawing(atPoint: point)
+        guard let image = image else { return }
+
+        let offset = offsetForDrawing(atPoint: point)
         
         var size = self.size
         
-        if size.width == 0.0 && image != nil
+        if size.width == 0.0
         {
-            size.width = image?.size.width ?? 0.0
+            size.width = image.size.width
         }
-        if size.height == 0.0 && image != nil
+        if size.height == 0.0
         {
-            size.height = image?.size.height ?? 0.0
+            size.height = image.size.height
         }
         
         let rect = CGRect(
@@ -102,7 +100,7 @@ open class MarkerImage: NSObject, IMarker
             height: size.height)
         
         NSUIGraphicsPushContext(context)
-        image!.draw(in: rect)
+        image.draw(in: rect)
         NSUIGraphicsPopContext()
     }
 }
diff --git a/Source/Charts/Components/MarkerView.swift b/Source/Charts/Components/MarkerView.swift
index 9e69132bd6..bf65e67cf1 100644
--- a/Source/Charts/Components/MarkerView.swift
+++ b/Source/Charts/Components/MarkerView.swift
@@ -12,8 +12,8 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
+#if canImport(AppKit)
+import AppKit
 #endif
 
 @objc(ChartMarkerView)
@@ -21,13 +21,13 @@ open class MarkerView: NSUIView, IMarker
 {
     open var offset: CGPoint = CGPoint()
     
-    open weak var chartView: ChartViewBase?
+    @objc open weak var chartView: ChartViewBase?
     
     open func offsetForDrawing(atPoint point: CGPoint) -> CGPoint
     {
-        var offset = self.offset
+        guard let chart = chartView else { return self.offset }
         
-        let chart = self.chartView
+        var offset = self.offset
         
         let width = self.bounds.size.width
         let height = self.bounds.size.height
@@ -36,18 +36,18 @@ open class MarkerView: NSUIView, IMarker
         {
             offset.x = -point.x
         }
-        else if chart != nil && point.x + width + offset.x > chart!.bounds.size.width
+        else if point.x + width + offset.x > chart.bounds.size.width
         {
-            offset.x = chart!.bounds.size.width - point.x - width
+            offset.x = chart.bounds.size.width - point.x - width
         }
         
         if point.y + offset.y < 0
         {
             offset.y = -point.y
         }
-        else if chart != nil && point.y + height + offset.y > chart!.bounds.size.height
+        else if point.y + height + offset.y > chart.bounds.size.height
         {
-            offset.y = chart!.bounds.size.height - point.y - height
+            offset.y = chart.bounds.size.height - point.y - height
         }
         
         return offset
@@ -72,27 +72,28 @@ open class MarkerView: NSUIView, IMarker
     }
     
     @objc
-    open class func viewFromXib() -> MarkerView?
+    open class func viewFromXib(in bundle: Bundle = .main) -> MarkerView?
     {
         #if !os(OSX)
-            return Bundle.main.loadNibNamed(
-                String(describing: self),
-                owner: nil,
-                options: nil)?[0] as? MarkerView
+        
+        return bundle.loadNibNamed(
+            String(describing: self),
+            owner: nil,
+            options: nil)?[0] as? MarkerView
         #else
-            
-            var loadedObjects = NSArray()
-            let loadedObjectsPointer = AutoreleasingUnsafeMutablePointer<NSArray>(&loadedObjects)
-            
-            if Bundle.main.loadNibNamed(
-                String(describing: self),
-                owner: nil,
-                topLevelObjects: loadedObjectsPointer)
-            {
-                return loadedObjects[0] as? MarkerView
-            }
-            
-            return nil
+        
+        var loadedObjects = NSArray()
+        let loadedObjectsPointer = AutoreleasingUnsafeMutablePointer<NSArray?>(&loadedObjects)
+        
+        if bundle.loadNibNamed(
+            NSNib.Name(String(describing: self)),
+            owner: nil,
+            topLevelObjects: loadedObjectsPointer)
+        {
+            return loadedObjects[0] as? MarkerView
+        }
+        
+        return nil
         #endif
     }
     
diff --git a/Source/Charts/Components/XAxis.swift b/Source/Charts/Components/XAxis.swift
index f4081355d8..1aee19dbd8 100755
--- a/Source/Charts/Components/XAxis.swift
+++ b/Source/Charts/Components/XAxis.swift
@@ -30,40 +30,40 @@ open class XAxis: AxisBase
     open var isDrawBottomYLabelEntryEnabled: Bool { return drawBottomYLabelEntryEnabled }
     
     /// width of the x-axis labels in pixels - this is automatically calculated by the `computeSize()` methods in the renderers
-    open var labelWidth = CGFloat(1.0)
+    @objc open var labelWidth = CGFloat(1.0)
     
     /// height of the x-axis labels in pixels - this is automatically calculated by the `computeSize()` methods in the renderers
-    open var labelHeight = CGFloat(1.0)
+    @objc open var labelHeight = CGFloat(1.0)
     
     /// width of the (rotated) x-axis labels in pixels - this is automatically calculated by the `computeSize()` methods in the renderers
-    open var labelRotatedWidth = CGFloat(1.0)
+    @objc open var labelRotatedWidth = CGFloat(1.0)
     
     /// height of the (rotated) x-axis labels in pixels - this is automatically calculated by the `computeSize()` methods in the renderers
-    open var labelRotatedHeight = CGFloat(1.0)
+    @objc open var labelRotatedHeight = CGFloat(1.0)
     
     /// This is the angle for drawing the X axis labels (in degrees)
-    open var labelRotationAngle = CGFloat(0.0)
+    @objc open var labelRotationAngle = CGFloat(0.0)
 
     /// if set to true, the chart will avoid that the first and last label entry in the chart "clip" off the edge of the chart
-    open var avoidFirstLastClippingEnabled = false
+    @objc open var avoidFirstLastClippingEnabled = false
     
     /// the position of the x-labels relative to the chart
-    open var labelPosition = LabelPosition.top
+    @objc open var labelPosition = LabelPosition.top
     
     /// if set to true, word wrapping the labels will be enabled.
     /// word wrapping is done using `(value width * labelRotatedWidth)`
     ///
-    /// - note: currently supports all charts except pie/radar/horizontal-bar*
-    open var wordWrapEnabled = false
+    /// - Note: currently supports all charts except pie/radar/horizontal-bar*
+    @objc open var wordWrapEnabled = false
     
-    /// - returns: `true` if word wrapping the labels is enabled
-    open var isWordWrapEnabled: Bool { return wordWrapEnabled }
+    /// `true` if word wrapping the labels is enabled
+    @objc open var isWordWrapEnabled: Bool { return wordWrapEnabled }
     
     /// the width for wrapping the labels, as percentage out of one value width.
     /// used only when isWordWrapEnabled = true.
     /// 
     /// **default**: 1.0
-    open var wordWrapWidthPercent: CGFloat = 1.0
+    @objc open var wordWrapWidthPercent: CGFloat = 1.0
     
     public override init()
     {
@@ -72,7 +72,7 @@ open class XAxis: AxisBase
         self.yOffset = 4.0
     }
     
-    open var isAvoidFirstLastClippingEnabled: Bool
+    @objc open var isAvoidFirstLastClippingEnabled: Bool
     {
         return avoidFirstLastClippingEnabled
     }
diff --git a/Source/Charts/Components/YAxis.swift b/Source/Charts/Components/YAxis.swift
index 54dfe4b924..8f528615a4 100644
--- a/Source/Charts/Components/YAxis.swift
+++ b/Source/Charts/Components/YAxis.swift
@@ -12,10 +12,14 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 
 /// Class representing the y-axis labels settings and its entries.
 /// Be aware that not all features the YLabels class provides are suitable for the RadarChart.
@@ -39,53 +43,59 @@ open class YAxis: AxisBase
     }
     
     /// indicates if the bottom y-label entry is drawn or not
-    open var drawBottomYLabelEntryEnabled = true
+    @objc open var drawBottomYLabelEntryEnabled = true
     
     /// indicates if the top y-label entry is drawn or not
-    open var drawTopYLabelEntryEnabled = true
+    @objc open var drawTopYLabelEntryEnabled = true
     
     /// flag that indicates if the axis is inverted or not
-    open var inverted = false
+    @objc open var inverted = false
     
     /// flag that indicates if the zero-line should be drawn regardless of other grid lines
-    open var drawZeroLineEnabled = false
+    @objc open var drawZeroLineEnabled = false
     
     /// Color of the zero line
-    open var zeroLineColor: NSUIColor? = NSUIColor.gray
+    @objc open var zeroLineColor: NSUIColor? = NSUIColor.gray
     
     /// Width of the zero line
-    open var zeroLineWidth: CGFloat = 1.0
+    @objc open var zeroLineWidth: CGFloat = 1.0
     
     /// This is how much (in pixels) into the dash pattern are we starting from.
-    open var zeroLineDashPhase = CGFloat(0.0)
+    @objc open var zeroLineDashPhase = CGFloat(0.0)
     
     /// This is the actual dash pattern.
     /// I.e. [2, 3] will paint [--   --   ]
     /// [1, 3, 4, 2] will paint [-   ----  -   ----  ]
-    open var zeroLineDashLengths: [CGFloat]?
+    @objc open var zeroLineDashLengths: [CGFloat]?
 
     /// axis space from the largest value to the top in percent of the total axis range
-    open var spaceTop = CGFloat(0.1)
+    @objc open var spaceTop = CGFloat(0.1)
 
     /// axis space from the smallest value to the bottom in percent of the total axis range
-    open var spaceBottom = CGFloat(0.1)
+    @objc open var spaceBottom = CGFloat(0.1)
     
     /// the position of the y-labels relative to the chart
-    open var labelPosition = LabelPosition.outsideChart
+    @objc open var labelPosition = LabelPosition.outsideChart
+
+    /// the alignment of the text in the y-label
+    @objc open var labelAlignment: NSTextAlignment = .left
+
+    /// the horizontal offset of the y-label
+    @objc open var labelXOffset: CGFloat = 0.0
     
     /// the side this axis object represents
-    fileprivate var _axisDependency = AxisDependency.left
+    private var _axisDependency = AxisDependency.left
     
     /// the minimum width that the axis should take
     /// 
     /// **default**: 0.0
-    open var minWidth = CGFloat(0)
+    @objc open var minWidth = CGFloat(0)
     
     /// the maximum width that the axis can take.
     /// use Infinity for disabling the maximum.
     /// 
     /// **default**: CGFloat.infinity
-    open var maxWidth = CGFloat(CGFloat.infinity)
+    @objc open var maxWidth = CGFloat(CGFloat.infinity)
     
     public override init()
     {
@@ -94,7 +104,7 @@ open class YAxis: AxisBase
         self.yOffset = 0.0
     }
     
-    public init(position: AxisDependency)
+    @objc public init(position: AxisDependency)
     {
         super.init()
         
@@ -103,28 +113,28 @@ open class YAxis: AxisBase
         self.yOffset = 0.0
     }
     
-    open var axisDependency: AxisDependency
+    @objc open var axisDependency: AxisDependency
     {
         return _axisDependency
     }
     
-    open func requiredSize() -> CGSize
+    @objc open func requiredSize() -> CGSize
     {
         let label = getLongestLabel() as NSString
-        var size = label.size(attributes: [NSFontAttributeName: labelFont])
+        var size = label.size(withAttributes: [NSAttributedString.Key.font: labelFont])
         size.width += xOffset * 2.0
         size.height += yOffset * 2.0
         size.width = max(minWidth, min(size.width, maxWidth > 0.0 ? maxWidth : size.width))
         return size
     }
     
-    open func getRequiredHeightSpace() -> CGFloat
+    @objc open func getRequiredHeightSpace() -> CGFloat
     {
         return requiredSize().height
     }
     
-    /// - returns: `true` if this axis needs horizontal offset, `false` ifno offset is needed.
-    open var needsOffset: Bool
+    /// `true` if this axis needs horizontal offset, `false` ifno offset is needed.
+    @objc open var needsOffset: Bool
     {
         if isEnabled && isDrawLabelsEnabled && labelPosition == .outsideChart
         {
@@ -136,7 +146,7 @@ open class YAxis: AxisBase
         }
     }
     
-    open var isInverted: Bool { return inverted }
+    @objc open var isInverted: Bool { return inverted }
     
     open override func calculate(min dataMin: Double, max dataMax: Double)
     {
@@ -144,6 +154,23 @@ open class YAxis: AxisBase
         var min = _customAxisMin ? _axisMinimum : dataMin
         var max = _customAxisMax ? _axisMaximum : dataMax
         
+        // Make sure max is greater than min
+        // Discussion: https://github.com/danielgindi/Charts/pull/3650#discussion_r221409991
+        if min > max
+        {
+            switch(_customAxisMax, _customAxisMin)
+            {
+            case(true, true):
+                (min, max) = (max, min)
+            case(true, false):
+                min = max < 0 ? max * 1.5 : max * 0.5
+            case(false, true):
+                max = min < 0 ? min * 0.5 : min * 1.5
+            case(false, false):
+                break
+            }
+        }
+        
         // temporary range (before calculations)
         let range = abs(max - min)
         
@@ -172,8 +199,8 @@ open class YAxis: AxisBase
         axisRange = abs(_axisMaximum - _axisMinimum)
     }
     
-    open var isDrawBottomYLabelEntryEnabled: Bool { return drawBottomYLabelEntryEnabled }
+    @objc open var isDrawBottomYLabelEntryEnabled: Bool { return drawBottomYLabelEntryEnabled }
     
-    open var isDrawTopYLabelEntryEnabled: Bool { return drawTopYLabelEntryEnabled }
+    @objc open var isDrawTopYLabelEntryEnabled: Bool { return drawTopYLabelEntryEnabled }
 
 }
diff --git a/Source/Charts/Data/Implementations/ChartBaseDataSet.swift b/Source/Charts/Data/Implementations/ChartBaseDataSet.swift
index 308b789559..5692e539d1 100644
--- a/Source/Charts/Data/Implementations/ChartBaseDataSet.swift
+++ b/Source/Charts/Data/Implementations/ChartBaseDataSet.swift
@@ -13,7 +13,7 @@ import Foundation
 import CoreGraphics
 
 
-open class ChartBaseDataSet: NSObject, IChartDataSet
+open class ChartBaseDataSet: NSObject, IChartDataSet, NSCopying
 {
     public required override init()
     {
@@ -21,16 +21,16 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
         
         // default color
         colors.append(NSUIColor(red: 140.0/255.0, green: 234.0/255.0, blue: 255.0/255.0, alpha: 1.0))
-        valueColors.append(NSUIColor.black)
+        valueColors.append(.labelOrBlack)
     }
     
-    public init(label: String?)
+    @objc public init(label: String?)
     {
         super.init()
         
         // default color
         colors.append(NSUIColor(red: 140.0/255.0, green: 234.0/255.0, blue: 255.0/255.0, alpha: 1.0))
-        valueColors.append(NSUIColor.black)
+        valueColors.append(.labelOrBlack)
         
         self.label = label
     }
@@ -198,7 +198,7 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     /// The axis this DataSet should be plotted against.
     open var axisDependency = YAxis.AxisDependency.left
     
-    /// - returns: The color at the given index of the DataSet's color array.
+    /// - Returns: The color at the given index of the DataSet's color array.
     /// This prevents out-of-bounds by performing a modulus on the color index, so colours will repeat themselves.
     open func color(atIndex index: Int) -> NSUIColor
     {
@@ -217,7 +217,9 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     }
     
     /// Adds a new color to the colors array of the DataSet.
-    /// - parameter color: the color to add
+    ///
+    /// - Parameters:
+    ///   - color: the color to add
     open func addColor(_ color: NSUIColor)
     {
         colors.append(color)
@@ -225,7 +227,9 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     
     /// Sets the one and **only** color that should be used for this DataSet.
     /// Internally, this recreates the colors array and adds the specified color.
-    /// - parameter color: the color to set
+    ///
+    /// - Parameters:
+    ///   - color: the color to set
     open func setColor(_ color: NSUIColor)
     {
         colors.removeAll(keepingCapacity: false)
@@ -233,31 +237,30 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     }
     
     /// Sets colors to a single color a specific alpha value.
-    /// - parameter color: the color to set
-    /// - parameter alpha: alpha to apply to the set `color`
-    open func setColor(_ color: NSUIColor, alpha: CGFloat)
+    ///
+    /// - Parameters:
+    ///   - color: the color to set
+    ///   - alpha: alpha to apply to the set `color`
+    @objc open func setColor(_ color: NSUIColor, alpha: CGFloat)
     {
         setColor(color.withAlphaComponent(alpha))
     }
     
     /// Sets colors with a specific alpha value.
-    /// - parameter colors: the colors to set
-    /// - parameter alpha: alpha to apply to the set `colors`
-    open func setColors(_ colors: [NSUIColor], alpha: CGFloat)
+    ///
+    /// - Parameters:
+    ///   - colors: the colors to set
+    ///   - alpha: alpha to apply to the set `colors`
+    @objc open func setColors(_ colors: [NSUIColor], alpha: CGFloat)
     {
-        var colorsWithAlpha = colors
-        
-        for i in 0 ..< colorsWithAlpha.count
-        {
-            colorsWithAlpha[i] = colorsWithAlpha[i] .withAlphaComponent(alpha)
-        }
-        
-        self.colors = colorsWithAlpha
+        self.colors = colors.map { $0.withAlphaComponent(alpha) }
     }
     
     /// Sets colors with a specific alpha value.
-    /// - parameter colors: the colors to set
-    /// - parameter alpha: alpha to apply to the set `colors`
+    ///
+    /// - Parameters:
+    ///   - colors: the colors to set
+    ///   - alpha: alpha to apply to the set `colors`
     open func setColors(_ colors: NSUIColor...)
     {
         self.colors = colors
@@ -266,7 +269,7 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     /// if true, value highlighting is enabled
     open var highlightEnabled = true
     
-    /// - returns: `true` if value highlighting is enabled for this dataset
+    /// `true` if value highlighting is enabled for this dataset
     open var isHighlightEnabled: Bool { return highlightEnabled }
     
     /// Custom formatter that is used instead of the auto-formatter if set
@@ -313,7 +316,7 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
         }
     }
     
-    /// - returns: The color at the specified index that is used for drawing the values inside the chart. Uses modulus internally.
+    /// - Returns: The color at the specified index that is used for drawing the values inside the chart. Uses modulus internally.
     open func valueTextColorAt(_ index: Int) -> NSUIColor
     {
         var index = index
@@ -354,10 +357,10 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     
     /// Set this to true to draw y-values on the chart.
     ///
-    /// - note: For bar and line charts: if `maxVisibleCount` is reached, no values will be drawn even if this is enabled.
+    /// - Note: For bar and line charts: if `maxVisibleCount` is reached, no values will be drawn even if this is enabled.
     open var drawValuesEnabled = true
     
-    /// - returns: `true` if y-value drawing is enabled, `false` ifnot
+    /// `true` if y-value drawing is enabled, `false` ifnot
     open var isDrawValuesEnabled: Bool
     {
         return drawValuesEnabled
@@ -365,7 +368,7 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
 
     /// Set this to true to draw y-icons on the chart.
     ///
-    /// - note: For bar and line charts: if `maxVisibleCount` is reached, no icons will be drawn even if this is enabled.
+    /// - Note: For bar and line charts: if `maxVisibleCount` is reached, no icons will be drawn even if this is enabled.
     open var drawIconsEnabled = true
     
     /// Returns true if y-icon drawing is enabled, false if not
@@ -384,7 +387,7 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     /// Set the visibility of this DataSet. If not visible, the DataSet will not be drawn to the chart upon refreshing it.
     open var visible = true
     
-    /// - returns: `true` if this DataSet is visible inside the chart, or `false` ifit is currently hidden.
+    /// `true` if this DataSet is visible inside the chart, or `false` ifit is currently hidden.
     open var isVisible: Bool
     {
         return visible
@@ -399,28 +402,34 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
     
     open override var debugDescription: String
     {
-        var desc = description + ":"
-        
-        for i in 0 ..< self.entryCount
-        {
-            desc += "\n" + (self.entryForIndex(i)?.description ?? "")
+        return (0..<entryCount).reduce(description + ":") {
+            $0 + "\n" + (self.entryForIndex($1)?.description ?? "")
         }
-        
-        return desc
     }
     
     // MARK: - NSCopying
     
-    open func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open func copy(with zone: NSZone? = nil) -> Any 
     {
         let copy = type(of: self).init()
         
         copy.colors = colors
         copy.valueColors = valueColors
         copy.label = label
+        copy.axisDependency = axisDependency
+        copy.highlightEnabled = highlightEnabled
+        copy._valueFormatter = _valueFormatter
+        copy.valueFont = valueFont
+        copy.form = form
+        copy.formSize = formSize
+        copy.formLineWidth = formLineWidth
+        copy.formLineDashPhase = formLineDashPhase
+        copy.formLineDashLengths = formLineDashLengths
+        copy.drawValuesEnabled = drawValuesEnabled
+        copy.drawValuesEnabled = drawValuesEnabled
+        copy.iconsOffset = iconsOffset
+        copy.visible = visible
         
         return copy
     }
 }
-
-
diff --git a/Source/Charts/Data/Implementations/Standard/BarChartData.swift b/Source/Charts/Data/Implementations/Standard/BarChartData.swift
index f8f24fae49..6697c32cf2 100644
--- a/Source/Charts/Data/Implementations/Standard/BarChartData.swift
+++ b/Source/Charts/Data/Implementations/Standard/BarChartData.swift
@@ -27,16 +27,17 @@ open class BarChartData: BarLineScatterCandleBubbleChartData
     /// The width of the bars on the x-axis, in values (not pixels)
     ///
     /// **default**: 0.85
-    open var barWidth = Double(0.85)
+    @objc open var barWidth = Double(0.85)
     
     /// Groups all BarDataSet objects this data object holds together by modifying the x-value of their entries.
     /// Previously set x-values of entries will be overwritten. Leaves space between bars and groups as specified by the parameters.
     /// Do not forget to call notifyDataSetChanged() on your BarChart object after calling this method.
     ///
-    /// - parameter the starting point on the x-axis where the grouping should begin
-    /// - parameter groupSpace: The space between groups of bars in values (not pixels) e.g. 0.8f for bar width 1f
-    /// - parameter barSpace: The space between individual bars in values (not pixels) e.g. 0.1f for bar width 1f
-    open func groupBars(fromX: Double, groupSpace: Double, barSpace: Double)
+    /// - Parameters:
+    ///   - fromX: the starting point on the x-axis where the grouping should begin
+    ///   - groupSpace: The space between groups of bars in values (not pixels) e.g. 0.8f for bar width 1f
+    ///   - barSpace: The space between individual bars in values (not pixels) e.g. 0.1f for bar width 1f
+    @objc open func groupBars(fromX: Double, groupSpace: Double, barSpace: Double)
     {
         let setCount = _dataSets.count
         if setCount <= 1
@@ -61,8 +62,7 @@ open class BarChartData: BarLineScatterCandleBubbleChartData
             let start = fromX
             fromX += groupSpaceWidthHalf
             
-            for set in _dataSets as! [IBarChartDataSet]
-            {
+            (_dataSets as? [IBarChartDataSet])?.forEach { set in
                 fromX += barSpaceHalf
                 fromX += barWidthHalf
                 
@@ -96,9 +96,10 @@ open class BarChartData: BarLineScatterCandleBubbleChartData
     
     /// In case of grouped bars, this method returns the space an individual group of bar needs on the x-axis.
     ///
-    /// - parameter groupSpace:
-    /// - parameter barSpace:
-    open func groupWidth(groupSpace: Double, barSpace: Double) -> Double
+    /// - Parameters:
+    ///   - groupSpace:
+    ///   - barSpace:
+    @objc open func groupWidth(groupSpace: Double, barSpace: Double) -> Double
     {
         return Double(_dataSets.count) * (self.barWidth + barSpace) + groupSpace
     }
diff --git a/Source/Charts/Data/Implementations/Standard/BarChartDataEntry.swift b/Source/Charts/Data/Implementations/Standard/BarChartDataEntry.swift
index a4ab03d85d..31c51b0f86 100644
--- a/Source/Charts/Data/Implementations/Standard/BarChartDataEntry.swift
+++ b/Source/Charts/Data/Implementations/Standard/BarChartDataEntry.swift
@@ -14,16 +14,16 @@ import Foundation
 open class BarChartDataEntry: ChartDataEntry
 {
     /// the values the stacked barchart holds
-    fileprivate var _yVals: [Double]?
+    private var _yVals: [Double]?
     
     /// the ranges for the individual stack values - automatically calculated
-    fileprivate var _ranges: [Range]?
+    private var _ranges: [Range]?
     
     /// the sum of all negative values this entry (if stacked) contains
-    fileprivate var _negativeSum: Double = 0.0
+    private var _negativeSum: Double = 0.0
     
     /// the sum of all positive values this entry (if stacked) contains
-    fileprivate var _positiveSum: Double = 0.0
+    private var _positiveSum: Double = 0.0
     
     public required init()
     {
@@ -37,165 +37,136 @@ open class BarChartDataEntry: ChartDataEntry
     }
     
     /// Constructor for normal bars (not stacked).
-    public override init(x: Double, y: Double, data: AnyObject?)
+    public convenience init(x: Double, y: Double, data: Any?)
     {
-        super.init(x: x, y: y, data: data)
+        self.init(x: x, y: y)
+        self.data = data
     }
     
     /// Constructor for normal bars (not stacked).
-    public override init(x: Double, y: Double, icon: NSUIImage?)
+    public convenience init(x: Double, y: Double, icon: NSUIImage?)
     {
-        super.init(x: x, y: y, icon: icon)
+        self.init(x: x, y: y)
+        self.icon = icon
     }
     
     /// Constructor for normal bars (not stacked).
-    public override init(x: Double, y: Double, icon: NSUIImage?, data: AnyObject?)
+    public convenience init(x: Double, y: Double, icon: NSUIImage?, data: Any?)
     {
-        super.init(x: x, y: y, icon: icon, data: data)
+        self.init(x: x, y: y)
+        self.icon = icon
+        self.data = data
     }
     
     /// Constructor for stacked bar entries.
-    public init(x: Double, yValues: [Double])
+    @objc public init(x: Double, yValues: [Double])
     {
         super.init(x: x, y: BarChartDataEntry.calcSum(values: yValues))
         self._yVals = yValues
         calcPosNegSum()
         calcRanges()
     }
-    
-    /// This constructor is misleading, please use the `data` argument instead of `label`.
-    @available(*, deprecated: 1.0, message: "Use `data` argument instead of `label`.")
-    public init(x: Double, yValues: [Double], label: String)
-    {
-        super.init(x: x, y: BarChartDataEntry.calcSum(values: yValues), data: label as AnyObject?)
-        self._yVals = yValues
-        calcPosNegSum()
-        calcRanges()
-    }
-    
+
     /// Constructor for stacked bar entries. One data object for whole stack
-    public init(x: Double, yValues: [Double], data: AnyObject?)
+    @objc public convenience init(x: Double, yValues: [Double], icon: NSUIImage?)
     {
-        super.init(x: x, y: BarChartDataEntry.calcSum(values: yValues), data: data)
-        self._yVals = yValues
-        calcPosNegSum()
-        calcRanges()
+        self.init(x: x, yValues: yValues)
+        self.icon = icon
     }
-    
+
     /// Constructor for stacked bar entries. One data object for whole stack
-    public init(x: Double, yValues: [Double], icon: NSUIImage?, data: AnyObject?)
+    @objc public convenience init(x: Double, yValues: [Double], data: Any?)
     {
-        super.init(x: x, y: BarChartDataEntry.calcSum(values: yValues), icon: icon, data: data)
-        self._yVals = yValues
-        calcPosNegSum()
-        calcRanges()
+        self.init(x: x, yValues: yValues)
+        self.data = data
     }
-    
+
     /// Constructor for stacked bar entries. One data object for whole stack
-    public init(x: Double, yValues: [Double], icon: NSUIImage?)
+    @objc public convenience init(x: Double, yValues: [Double], icon: NSUIImage?, data: Any?)
     {
-        super.init(x: x, y: BarChartDataEntry.calcSum(values: yValues), icon: icon)
-        self._yVals = yValues
-        calcPosNegSum()
-        calcRanges()
+        self.init(x: x, yValues: yValues)
+        self.icon = icon
+        self.data = data
     }
     
-    open func sumBelow(stackIndex :Int) -> Double
+    @objc open func sumBelow(stackIndex :Int) -> Double
     {
-        if _yVals == nil
+        guard let yVals = _yVals else
         {
             return 0
         }
         
         var remainder: Double = 0.0
-        var index = _yVals!.count - 1
+        var index = yVals.count - 1
         
         while (index > stackIndex && index >= 0)
         {
-            remainder += _yVals![index]
+            remainder += yVals[index]
             index -= 1
         }
         
         return remainder
     }
     
-    /// - returns: The sum of all negative values this entry (if stacked) contains. (this is a positive number)
-    open var negativeSum: Double
+    /// The sum of all negative values this entry (if stacked) contains. (this is a positive number)
+    @objc open var negativeSum: Double
     {
         return _negativeSum
     }
     
-    /// - returns: The sum of all positive values this entry (if stacked) contains.
-    open var positiveSum: Double
+    /// The sum of all positive values this entry (if stacked) contains.
+    @objc open var positiveSum: Double
     {
         return _positiveSum
     }
 
-    open func calcPosNegSum()
+    @objc open func calcPosNegSum()
     {
-        if _yVals == nil
-        {
-            _positiveSum = 0.0
-            _negativeSum = 0.0
-            return
-        }
-        
-        var sumNeg: Double = 0.0
-        var sumPos: Double = 0.0
-        
-        for f in _yVals!
-        {
-            if f < 0.0
+        (_negativeSum, _positiveSum) = _yVals?.reduce(into: (0,0)) { (result, y) in
+            if y < 0
             {
-                sumNeg += -f
+                result.0 += -y
             }
             else
             {
-                sumPos += f
+                result.1 += y
             }
-        }
-        
-        _negativeSum = sumNeg
-        _positiveSum = sumPos
+        } ?? (0,0)
     }
     
     /// Splits up the stack-values of the given bar-entry into Range objects.
-    /// - parameter entry:
-    /// - returns:
-    open func calcRanges()
+    ///
+    /// - Parameters:
+    ///   - entry:
+    /// - Returns:
+    @objc open func calcRanges()
     {
-        let values = yValues
-        if values?.isEmpty != false
-        {
-            return
-        }
-        
+        guard let values = yValues, !values.isEmpty else { return }
+
         if _ranges == nil
         {
             _ranges = [Range]()
         }
         else
         {
-            _ranges?.removeAll()
+            _ranges!.removeAll()
         }
         
-        _ranges?.reserveCapacity(values!.count)
+        _ranges!.reserveCapacity(values.count)
         
         var negRemain = -negativeSum
         var posRemain: Double = 0.0
         
-        for i in 0 ..< values!.count
+        for value in values
         {
-            let value = values![i]
-            
             if value < 0
             {
-                _ranges?.append(Range(from: negRemain, to: negRemain - value))
+                _ranges!.append(Range(from: negRemain, to: negRemain - value))
                 negRemain -= value
             }
             else
             {
-                _ranges?.append(Range(from: posRemain, to: posRemain + value))
+                _ranges!.append(Range(from: posRemain, to: posRemain + value))
                 posRemain += value
             }
         }
@@ -204,10 +175,10 @@ open class BarChartDataEntry: ChartDataEntry
     // MARK: Accessors
     
     /// the values the stacked barchart holds
-    open var isStacked: Bool { return _yVals != nil }
+    @objc open var isStacked: Bool { return _yVals != nil }
     
     /// the values the stacked barchart holds
-    open var yValues: [Double]?
+    @objc open var yValues: [Double]?
     {
         get { return self._yVals }
         set
@@ -219,28 +190,30 @@ open class BarChartDataEntry: ChartDataEntry
         }
     }
     
-    /// - returns: The ranges of the individual stack-entries. Will return null if this entry is not stacked.
-    open var ranges: [Range]?
+    /// The ranges of the individual stack-entries. Will return null if this entry is not stacked.
+    @objc open var ranges: [Range]?
     {
         return _ranges
     }
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! BarChartDataEntry
+        let copy = super.copy(with: zone) as! BarChartDataEntry
         copy._yVals = _yVals
         copy.y = y
         copy._negativeSum = _negativeSum
+        copy._positiveSum = _positiveSum
         return copy
     }
     
     /// Calculates the sum across all values of the given stack.
     ///
-    /// - parameter vals:
-    /// - returns:
-    fileprivate static func calcSum(values: [Double]?) -> Double
+    /// - Parameters:
+    ///   - vals:
+    /// - Returns:
+    private static func calcSum(values: [Double]?) -> Double
     {
         guard let values = values
             else { return 0.0 }
diff --git a/Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift
index bba2cac4ad..2478aeccf8 100644
--- a/Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift
@@ -15,12 +15,12 @@ import CoreGraphics
 
 open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBarChartDataSet
 {
-    fileprivate func initialize()
+    private func initialize()
     {
         self.highlightColor = NSUIColor.black
         
-        self.calcStackSize(entries: values as! [BarChartDataEntry])
-        self.calcEntryCountIncludingStacks(entries: values as! [BarChartDataEntry])
+        self.calcStackSize(entries: entries as! [BarChartDataEntry])
+        self.calcEntryCountIncludingStacks(entries: entries as! [BarChartDataEntry])
     }
     
     public required init()
@@ -29,9 +29,9 @@ open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBarChartDat
         initialize()
     }
     
-    public override init(values: [ChartDataEntry]?, label: String?)
+    public override init(entries: [ChartDataEntry]?, label: String?)
     {
-        super.init(values: values, label: label)
+        super.init(entries: entries, label: label)
         initialize()
     }
 
@@ -39,14 +39,14 @@ open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBarChartDat
     
     /// the maximum number of bars that are stacked upon each other, this value
     /// is calculated from the Entries that are added to the DataSet
-    fileprivate var _stackSize = 1
+    private var _stackSize = 1
     
     /// the overall entry count, including counting each stack-value individually
-    fileprivate var _entryCountStacks = 0
+    private var _entryCountStacks = 0
     
     /// Calculates the total number of entries this DataSet represents, including
     /// stacks. All values belonging to a stack are calculated separately.
-    fileprivate func calcEntryCountIncludingStacks(entries: [BarChartDataEntry])
+    private func calcEntryCountIncludingStacks(entries: [BarChartDataEntry])
     {
         _entryCountStacks = 0
         
@@ -64,7 +64,7 @@ open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBarChartDat
     }
     
     /// calculates the maximum stacksize that occurs in the Entries array of this DataSet
-    fileprivate func calcStackSize(entries: [BarChartDataEntry])
+    private func calcStackSize(entries: [BarChartDataEntry])
     {
         for i in 0 ..< entries.count
         {
@@ -114,26 +114,26 @@ open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBarChartDat
         }
     }
     
-    /// - returns: The maximum number of bars that can be stacked upon another in this DataSet.
+    /// The maximum number of bars that can be stacked upon another in this DataSet.
     open var stackSize: Int
     {
         return _stackSize
     }
     
-    /// - returns: `true` if this DataSet is stacked (stacksize > 1) or not.
+    /// `true` if this DataSet is stacked (stacksize > 1) or not.
     open var isStacked: Bool
     {
         return _stackSize > 1 ? true : false
     }
     
-    /// - returns: The overall entry count, including counting each stack-value individually
-    open var entryCountStacks: Int
+    /// The overall entry count, including counting each stack-value individually
+    @objc open var entryCountStacks: Int
     {
         return _entryCountStacks
     }
     
     /// array of labels used to describe the different values of the stacked bars
-    open var stackLabels: [String] = ["Stack"]
+    open var stackLabels: [String] = []
     
     // MARK: - Styling functions and accessors
     
@@ -151,14 +151,16 @@ open class BarChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBarChartDat
     
     // MARK: - NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! BarChartDataSet
+        let copy = super.copy(with: zone) as! BarChartDataSet
         copy._stackSize = _stackSize
         copy._entryCountStacks = _entryCountStacks
         copy.stackLabels = stackLabels
 
         copy.barShadowColor = barShadowColor
+        copy.barBorderWidth = barBorderWidth
+        copy.barBorderColor = barBorderColor
         copy.highlightAlpha = highlightAlpha
         return copy
     }
diff --git a/Source/Charts/Data/Implementations/Standard/BarLineScatterCandleBubbleChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/BarLineScatterCandleBubbleChartDataSet.swift
index 02b942f479..91382515a8 100644
--- a/Source/Charts/Data/Implementations/Standard/BarLineScatterCandleBubbleChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/BarLineScatterCandleBubbleChartDataSet.swift
@@ -26,9 +26,9 @@ open class BarLineScatterCandleBubbleChartDataSet: ChartDataSet, IBarLineScatter
     
     // MARK: - NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! BarLineScatterCandleBubbleChartDataSet
+        let copy = super.copy(with: zone) as! BarLineScatterCandleBubbleChartDataSet
         copy.highlightColor = highlightColor
         copy.highlightLineWidth = highlightLineWidth
         copy.highlightLineDashPhase = highlightLineDashPhase
diff --git a/Source/Charts/Data/Implementations/Standard/BubbleChartData.swift b/Source/Charts/Data/Implementations/Standard/BubbleChartData.swift
index 05c247e59d..433f384f75 100644
--- a/Source/Charts/Data/Implementations/Standard/BubbleChartData.swift
+++ b/Source/Charts/Data/Implementations/Standard/BubbleChartData.swift
@@ -25,11 +25,8 @@ open class BubbleChartData: BarLineScatterCandleBubbleChartData
     }
     
     /// Sets the width of the circle that surrounds the bubble when highlighted for all DataSet objects this data object contains
-    open func setHighlightCircleWidth(_ width: CGFloat)
+    @objc open func setHighlightCircleWidth(_ width: CGFloat)
     {
-        for set in (_dataSets as? [IBubbleChartDataSet])!
-        {
-            set.highlightCircleWidth = width
-        }
+        (_dataSets as? [IBubbleChartDataSet])?.forEach { $0.highlightCircleWidth = width }
     }
 }
diff --git a/Source/Charts/Data/Implementations/Standard/BubbleChartDataEntry.swift b/Source/Charts/Data/Implementations/Standard/BubbleChartDataEntry.swift
index 95941253ba..01f9fc968d 100644
--- a/Source/Charts/Data/Implementations/Standard/BubbleChartDataEntry.swift
+++ b/Source/Charts/Data/Implementations/Standard/BubbleChartDataEntry.swift
@@ -15,62 +15,64 @@ import CoreGraphics
 open class BubbleChartDataEntry: ChartDataEntry
 {
     /// The size of the bubble.
-    open var size = CGFloat(0.0)
+    @objc open var size = CGFloat(0.0)
     
     public required init()
     {
         super.init()
     }
     
-    /// - parameter x: The index on the x-axis.
-    /// - parameter y: The value on the y-axis.
-    /// - parameter size: The size of the bubble.
-    public init(x: Double, y: Double, size: CGFloat)
+    /// - Parameters:
+    ///   - x: The index on the x-axis.
+    ///   - y: The value on the y-axis.
+    ///   - size: The size of the bubble.
+    @objc public init(x: Double, y: Double, size: CGFloat)
     {
         super.init(x: x, y: y)
         
         self.size = size
     }
     
-    /// - parameter x: The index on the x-axis.
-    /// - parameter y: The value on the y-axis.
-    /// - parameter size: The size of the bubble.
-    /// - parameter data: Spot for additional data this Entry represents.
-    public init(x: Double, y: Double, size: CGFloat, data: AnyObject?)
+    /// - Parameters:
+    ///   - x: The index on the x-axis.
+    ///   - y: The value on the y-axis.
+    ///   - size: The size of the bubble.
+    ///   - data: Spot for additional data this Entry represents.
+    @objc public convenience init(x: Double, y: Double, size: CGFloat, data: Any?)
     {
-        super.init(x: x, y: y, data: data)
-        
-        self.size = size
+        self.init(x: x, y: y, size: size)
+        self.data = data
     }
     
-    /// - parameter x: The index on the x-axis.
-    /// - parameter y: The value on the y-axis.
-    /// - parameter size: The size of the bubble.
-    /// - parameter icon: icon image
-    public init(x: Double, y: Double, size: CGFloat, icon: NSUIImage?)
+    /// - Parameters:
+    ///   - x: The index on the x-axis.
+    ///   - y: The value on the y-axis.
+    ///   - size: The size of the bubble.
+    ///   - icon: icon image
+    @objc public convenience init(x: Double, y: Double, size: CGFloat, icon: NSUIImage?)
     {
-        super.init(x: x, y: y, icon: icon)
-        
-        self.size = size
+        self.init(x: x, y: y, size: size)
+        self.icon = icon
     }
     
-    /// - parameter x: The index on the x-axis.
-    /// - parameter y: The value on the y-axis.
-    /// - parameter size: The size of the bubble.
-    /// - parameter icon: icon image
-    /// - parameter data: Spot for additional data this Entry represents.
-    public init(x: Double, y: Double, size: CGFloat, icon: NSUIImage?, data: AnyObject?)
+    /// - Parameters:
+    ///   - x: The index on the x-axis.
+    ///   - y: The value on the y-axis.
+    ///   - size: The size of the bubble.
+    ///   - icon: icon image
+    ///   - data: Spot for additional data this Entry represents.
+    @objc public convenience init(x: Double, y: Double, size: CGFloat, icon: NSUIImage?, data: Any?)
     {
-        super.init(x: x, y: y, icon: icon, data: data)
-        
-        self.size = size
+        self.init(x: x, y: y, size: size)
+        self.icon = icon
+        self.data = data
     }
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! BubbleChartDataEntry
+        let copy = super.copy(with: zone) as! BubbleChartDataEntry
         copy.size = size
         return copy
     }
diff --git a/Source/Charts/Data/Implementations/Standard/BubbleChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/BubbleChartDataSet.swift
index 90ec41f839..775fafb8bd 100644
--- a/Source/Charts/Data/Implementations/Standard/BubbleChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/BubbleChartDataSet.swift
@@ -20,7 +20,7 @@ open class BubbleChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBubbleCh
     internal var _maxSize = CGFloat(0.0)
     
     open var maxSize: CGFloat { return _maxSize }
-    open var normalizeSizeEnabled: Bool = true
+    @objc open var normalizeSizeEnabled: Bool = true
     open var isNormalizeSizeEnabled: Bool { return normalizeSizeEnabled }
     
     open override func calcMinMax(entry e: ChartDataEntry)
@@ -45,12 +45,13 @@ open class BubbleChartDataSet: BarLineScatterCandleBubbleChartDataSet, IBubbleCh
     
     // MARK: - NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! BubbleChartDataSet
+        let copy = super.copy(with: zone) as! BubbleChartDataSet
         copy._xMin = _xMin
         copy._xMax = _xMax
         copy._maxSize = _maxSize
+        copy.normalizeSizeEnabled = normalizeSizeEnabled
         copy.highlightCircleWidth = highlightCircleWidth
         return copy
     }
diff --git a/Source/Charts/Data/Implementations/Standard/CandleChartDataEntry.swift b/Source/Charts/Data/Implementations/Standard/CandleChartDataEntry.swift
index 799f1b75a1..467bc168d1 100644
--- a/Source/Charts/Data/Implementations/Standard/CandleChartDataEntry.swift
+++ b/Source/Charts/Data/Implementations/Standard/CandleChartDataEntry.swift
@@ -14,23 +14,23 @@ import Foundation
 open class CandleChartDataEntry: ChartDataEntry
 {
     /// shadow-high value
-    open var high = Double(0.0)
+    @objc open var high = Double(0.0)
     
     /// shadow-low value
-    open var low = Double(0.0)
+    @objc open var low = Double(0.0)
     
     /// close value
-    open var close = Double(0.0)
+    @objc open var close = Double(0.0)
     
     /// open value
-    open var open = Double(0.0)
+    @objc open var open = Double(0.0)
     
     public required init()
     {
         super.init()
     }
     
-    public init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double)
+    @objc public init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double)
     {
         super.init(x: x, y: (shadowH + shadowL) / 2.0)
         
@@ -39,45 +39,34 @@ open class CandleChartDataEntry: ChartDataEntry
         self.open = open
         self.close = close
     }
-    
-    public init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double, data: AnyObject?)
+
+    @objc public convenience init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double, icon: NSUIImage?)
     {
-        super.init(x: x, y: (shadowH + shadowL) / 2.0, data: data)
-        
-        self.high = shadowH
-        self.low = shadowL
-        self.open = open
-        self.close = close
+        self.init(x: x, shadowH: shadowH, shadowL: shadowL, open: open, close: close)
+        self.icon = icon
     }
-    
-    public init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double, icon: NSUIImage?)
+
+    @objc public convenience init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double, data: Any?)
     {
-        super.init(x: x, y: (shadowH + shadowL) / 2.0, icon: icon)
-        
-        self.high = shadowH
-        self.low = shadowL
-        self.open = open
-        self.close = close
+        self.init(x: x, shadowH: shadowH, shadowL: shadowL, open: open, close: close)
+        self.data = data
     }
-    
-    public init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double, icon: NSUIImage?, data: AnyObject?)
+
+    @objc public convenience init(x: Double, shadowH: Double, shadowL: Double, open: Double, close: Double, icon: NSUIImage?, data: Any?)
     {
-        super.init(x: x, y: (shadowH + shadowL) / 2.0, icon: icon, data: data)
-        
-        self.high = shadowH
-        self.low = shadowL
-        self.open = open
-        self.close = close
+        self.init(x: x, shadowH: shadowH, shadowL: shadowL, open: open, close: close)
+        self.icon = icon
+        self.data = data
     }
     
-    /// - returns: The overall range (difference) between shadow-high and shadow-low.
-    open var shadowRange: Double
+    /// The overall range (difference) between shadow-high and shadow-low.
+    @objc open var shadowRange: Double
     {
         return abs(high - low)
     }
     
-    /// - returns: The body size (difference between open and close).
-    open var bodyRange: Double
+    /// The body size (difference between open and close).
+    @objc open var bodyRange: Double
     {
         return abs(open - close)
     }
@@ -97,9 +86,9 @@ open class CandleChartDataEntry: ChartDataEntry
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! CandleChartDataEntry
+        let copy = super.copy(with: zone) as! CandleChartDataEntry
         copy.high = high
         copy.low = low
         copy.open = open
diff --git a/Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift
index d4da90d69f..1c51da7d26 100644
--- a/Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift
@@ -21,9 +21,9 @@ open class CandleChartDataSet: LineScatterCandleRadarChartDataSet, ICandleChartD
         super.init()
     }
     
-    public override init(values: [ChartDataEntry]?, label: String?)
+    public override init(entries: [ChartDataEntry]?, label: String?)
     {
-        super.init(values: values, label: label)
+        super.init(entries: entries, label: label)
     }
     
     // MARK: - Data functions and accessors
@@ -75,31 +75,20 @@ open class CandleChartDataSet: LineScatterCandleRadarChartDataSet, ICandleChartD
     /// the space between the candle entries
     ///
     /// **default**: 0.1 (10%)
-    fileprivate var _barSpace = CGFloat(0.1)
+    private var _barSpace = CGFloat(0.1)
     
     /// the space that is left out on the left and right side of each candle,
     /// **default**: 0.1 (10%), max 0.45, min 0.0
     open var barSpace: CGFloat
     {
-        set
-        {
-            if newValue < 0.0
-            {
-                _barSpace = 0.0
-            }
-            else if newValue > 0.45
-            {
-                _barSpace = 0.45
-            }
-            else
-            {
-                _barSpace = newValue
-            }
-        }
         get
         {
             return _barSpace
         }
+        set
+        {
+            _barSpace = newValue.clamped(to: 0...0.45)
+        }
     }
     
     /// should the candle bars show?
diff --git a/Source/Charts/Data/Implementations/Standard/ChartData.swift b/Source/Charts/Data/Implementations/Standard/ChartData.swift
index 5d64efeb84..f4699ef702 100644
--- a/Source/Charts/Data/Implementations/Standard/ChartData.swift
+++ b/Source/Charts/Data/Implementations/Standard/ChartData.swift
@@ -31,7 +31,7 @@ open class ChartData: NSObject
         _dataSets = [IChartDataSet]()
     }
     
-    public init(dataSets: [IChartDataSet]?)
+    @objc public init(dataSets: [IChartDataSet]?)
     {
         super.init()
         
@@ -40,7 +40,7 @@ open class ChartData: NSObject
         self.initialize(dataSets: _dataSets)
     }
     
-    public convenience init(dataSet: IChartDataSet?)
+    @objc public convenience init(dataSet: IChartDataSet?)
     {
         self.init(dataSets: dataSet === nil ? nil : [dataSet!])
     }
@@ -52,34 +52,27 @@ open class ChartData: NSObject
     
     /// Call this method to let the ChartData know that the underlying data has changed.
     /// Calling this performs all necessary recalculations needed when the contained data has changed.
-    open func notifyDataChanged()
+    @objc open func notifyDataChanged()
     {
         calcMinMax()
     }
     
-    open func calcMinMaxY(fromX: Double, toX: Double)
+    @objc open func calcMinMaxY(fromX: Double, toX: Double)
     {
-        for set in _dataSets
-        {
-            set.calcMinMaxY(fromX: fromX, toX: toX)
-        }
-        
+        _dataSets.forEach { $0.calcMinMaxY(fromX: fromX, toX: toX) }
         // apply the new data
         calcMinMax()
     }
     
     /// calc minimum and maximum y value over all datasets
-    open func calcMinMax()
+    @objc open func calcMinMax()
     {
         _yMax = -Double.greatestFiniteMagnitude
         _yMin = Double.greatestFiniteMagnitude
         _xMax = -Double.greatestFiniteMagnitude
         _xMin = Double.greatestFiniteMagnitude
         
-        for set in _dataSets
-        {
-            calcMinMax(dataSet: set)
-        }
+        _dataSets.forEach { calcMinMax(dataSet: $0) }
         
         _leftAxisMax = -Double.greatestFiniteMagnitude
         _leftAxisMin = Double.greatestFiniteMagnitude
@@ -138,7 +131,7 @@ open class ChartData: NSObject
     }
     
     /// Adjusts the current minimum and maximum values based on the provided Entry object.
-    open func calcMinMax(entry e: ChartDataEntry, axis: YAxis.AxisDependency)
+    @objc open func calcMinMax(entry e: ChartDataEntry, axis: YAxis.AxisDependency)
     {
         if _yMax < e.y
         {
@@ -187,7 +180,7 @@ open class ChartData: NSObject
     }
     
     /// Adjusts the minimum and maximum values based on the given DataSet.
-    open func calcMinMax(dataSet d: IChartDataSet)
+    @objc open func calcMinMax(dataSet d: IChartDataSet)
     {
         if _yMax < d.yMax
         {
@@ -235,14 +228,14 @@ open class ChartData: NSObject
         }
     }
     
-    /// - returns: The number of LineDataSets this object contains
-    open var dataSetCount: Int
+    /// The number of LineDataSets this object contains
+    @objc open var dataSetCount: Int
     {
         return _dataSets.count
     }
     
-    /// - returns: The smallest y-value the data object contains.
-    open var yMin: Double
+    /// The smallest y-value the data object contains.
+    @objc open var yMin: Double
     {
         return _yMin
     }
@@ -253,7 +246,7 @@ open class ChartData: NSObject
         return _yMin
     }
     
-    open func getYMin(axis: YAxis.AxisDependency) -> Double
+    @objc open func getYMin(axis: YAxis.AxisDependency) -> Double
     {
         if axis == .left
         {
@@ -279,8 +272,8 @@ open class ChartData: NSObject
         }
     }
     
-    /// - returns: The greatest y-value the data object contains.
-    open var yMax: Double
+    /// The greatest y-value the data object contains.
+    @objc open var yMax: Double
     {
         return _yMax
     }
@@ -291,7 +284,7 @@ open class ChartData: NSObject
         return _yMax
     }
     
-    open func getYMax(axis: YAxis.AxisDependency) -> Double
+    @objc open func getYMax(axis: YAxis.AxisDependency) -> Double
     {
         if axis == .left
         {
@@ -317,19 +310,19 @@ open class ChartData: NSObject
         }
     }
     
-    /// - returns: The minimum x-value the data object contains.
-    open var xMin: Double
+    /// The minimum x-value the data object contains.
+    @objc open var xMin: Double
     {
         return _xMin
     }
-    /// - returns: The maximum x-value the data object contains.
-    open var xMax: Double
+    /// The maximum x-value the data object contains.
+    @objc open var xMax: Double
     {
         return _xMax
     }
     
-    /// - returns: All DataSet objects this ChartData object holds.
-    open var dataSets: [IChartDataSet]
+    /// All DataSet objects this ChartData object holds.
+    @objc open var dataSets: [IChartDataSet]
     {
         get
         {
@@ -346,63 +339,32 @@ open class ChartData: NSObject
     /// 
     /// **IMPORTANT: This method does calculations at runtime, do not over-use in performance critical situations.**
     ///
-    /// - parameter dataSets: the DataSet array to search
-    /// - parameter type:
-    /// - parameter ignorecase: if true, the search is not case-sensitive
-    /// - returns: The index of the DataSet Object with the given label. Sensitive or not.
+    /// - Parameters:
+    ///   - dataSets: the DataSet array to search
+    ///   - type:
+    ///   - ignorecase: if true, the search is not case-sensitive
+    /// - Returns: The index of the DataSet Object with the given label. Sensitive or not.
     internal func getDataSetIndexByLabel(_ label: String, ignorecase: Bool) -> Int
     {
+        // TODO: Return nil instead of -1
         if ignorecase
         {
-            for i in 0 ..< dataSets.count
-            {
-                if dataSets[i].label == nil
-                {
-                    continue
-                }
-                if (label.caseInsensitiveCompare(dataSets[i].label!) == ComparisonResult.orderedSame)
-                {
-                    return i
-                }
-            }
+            return dataSets.firstIndex { $0.label?.caseInsensitiveCompare(label) == .orderedSame }
+                ?? -1
         }
         else
         {
-            for i in 0 ..< dataSets.count
-            {
-                if label == dataSets[i].label
-                {
-                    return i
-                }
-            }
-        }
-        
-        return -1
-    }
-    
-    /// - returns: The labels of all DataSets as a string array.
-    internal func dataSetLabels() -> [String]
-    {
-        var types = [String]()
-        
-        for i in 0 ..< _dataSets.count
-        {
-            if dataSets[i].label == nil
-            {
-                continue
-            }
-            
-            types[i] = _dataSets[i].label!
+            return dataSets.firstIndex { $0.label == label }
+                ?? -1
         }
-        
-        return types
     }
-    
+
     /// Get the Entry for a corresponding highlight object
     ///
-    /// - parameter highlight:
-    /// - returns: The entry that is highlighted
-    open func entryForHighlight(_ highlight: Highlight) -> ChartDataEntry?
+    /// - Parameters:
+    ///   - highlight:
+    /// - Returns: The entry that is highlighted
+    @objc open func entryForHighlight(_ highlight: Highlight) -> ChartDataEntry?
     {
         if highlight.dataSetIndex >= dataSets.count
         {
@@ -416,10 +378,11 @@ open class ChartData: NSObject
     
     /// **IMPORTANT: This method does calculations at runtime. Use with care in performance critical situations.**
     ///
-    /// - parameter label:
-    /// - parameter ignorecase:
-    /// - returns: The DataSet Object with the given label. Sensitive or not.
-    open func getDataSetByLabel(_ label: String, ignorecase: Bool) -> IChartDataSet?
+    /// - Parameters:
+    ///   - label:
+    ///   - ignorecase:
+    /// - Returns: The DataSet Object with the given label. Sensitive or not.
+    @objc open func getDataSetByLabel(_ label: String, ignorecase: Bool) -> IChartDataSet?
     {
         let index = getDataSetIndexByLabel(label, ignorecase: ignorecase)
         
@@ -433,7 +396,7 @@ open class ChartData: NSObject
         }
     }
     
-    open func getDataSetByIndex(_ index: Int) -> IChartDataSet!
+    @objc open func getDataSetByIndex(_ index: Int) -> IChartDataSet!
     {
         if index < 0 || index >= _dataSets.count
         {
@@ -443,7 +406,7 @@ open class ChartData: NSObject
         return _dataSets[index]
     }
     
-    open func addDataSet(_ dataSet: IChartDataSet!)
+    @objc open func addDataSet(_ dataSet: IChartDataSet!)
     {
         calcMinMax(dataSet: dataSet)
         
@@ -453,30 +416,18 @@ open class ChartData: NSObject
     /// Removes the given DataSet from this data object.
     /// Also recalculates all minimum and maximum values.
     ///
-    /// - returns: `true` if a DataSet was removed, `false` ifno DataSet could be removed.
-    @discardableResult open func removeDataSet(_ dataSet: IChartDataSet!) -> Bool
+    /// - Returns: `true` if a DataSet was removed, `false` ifno DataSet could be removed.
+    @objc @discardableResult open func removeDataSet(_ dataSet: IChartDataSet) -> Bool
     {
-        if dataSet === nil
-        {
-            return false
-        }
-        
-        for i in 0 ..< _dataSets.count
-        {
-            if _dataSets[i] === dataSet
-            {
-                return removeDataSetByIndex(i)
-            }
-        }
-        
-        return false
+        guard let i = _dataSets.firstIndex(where: { $0 === dataSet }) else { return false }
+        return removeDataSetByIndex(i)
     }
     
     /// Removes the DataSet at the given index in the DataSet array from the data object. 
     /// Also recalculates all minimum and maximum values. 
     ///
-    /// - returns: `true` if a DataSet was removed, `false` ifno DataSet could be removed.
-    @discardableResult open func removeDataSetByIndex(_ index: Int) -> Bool
+    /// - Returns: `true` if a DataSet was removed, `false` ifno DataSet could be removed.
+    @objc @discardableResult open func removeDataSetByIndex(_ index: Int) -> Bool
     {
         if index >= _dataSets.count || index < 0
         {
@@ -491,7 +442,7 @@ open class ChartData: NSObject
     }
     
     /// Adds an Entry to the DataSet at the specified index. Entries are added to the end of the list.
-    open func addEntry(_ e: ChartDataEntry, dataSetIndex: Int)
+    @objc open func addEntry(_ e: ChartDataEntry, dataSetIndex: Int)
     {
         if _dataSets.count > dataSetIndex && dataSetIndex >= 0
         {
@@ -508,7 +459,7 @@ open class ChartData: NSObject
     }
     
     /// Removes the given Entry object from the DataSet at the specified index.
-    @discardableResult open func removeEntry(_ entry: ChartDataEntry, dataSetIndex: Int) -> Bool
+    @objc @discardableResult open func removeEntry(_ entry: ChartDataEntry, dataSetIndex: Int) -> Bool
     {
         // entry outofbounds
         if dataSetIndex >= _dataSets.count
@@ -529,8 +480,9 @@ open class ChartData: NSObject
     
     /// Removes the Entry object closest to the given xIndex from the ChartDataSet at the
     /// specified index. 
-    /// - returns: `true` if an entry was removed, `false` ifno Entry was found that meets the specified requirements.
-    @discardableResult open func removeEntry(xValue: Double, dataSetIndex: Int) -> Bool
+    ///
+    /// - Returns: `true` if an entry was removed, `false` ifno Entry was found that meets the specified requirements.
+    @objc @discardableResult open func removeEntry(xValue: Double, dataSetIndex: Int) -> Bool
     {
         if dataSetIndex >= _dataSets.count
         {
@@ -545,215 +497,114 @@ open class ChartData: NSObject
         return false
     }
     
-    /// - returns: The DataSet that contains the provided Entry, or null, if no DataSet contains this entry.
-    open func getDataSetForEntry(_ e: ChartDataEntry!) -> IChartDataSet?
+    /// - Returns: The DataSet that contains the provided Entry, or null, if no DataSet contains this entry.
+    @objc open func getDataSetForEntry(_ e: ChartDataEntry) -> IChartDataSet?
     {
-        if e == nil
-        {
-            return nil
-        }
-        
-        for i in 0 ..< _dataSets.count
-        {
-            let set = _dataSets[i]
-            
-            if e === set.entryForXValue(e.x, closestToY: e.y)
-            {
-                return set
-            }
-        }
-        
-        return nil
+        return _dataSets.first { $0.entryForXValue(e.x, closestToY: e.y) === e }
     }
 
-    /// - returns: The index of the provided DataSet in the DataSet array of this data object, or -1 if it does not exist.
-    open func indexOfDataSet(_ dataSet: IChartDataSet) -> Int
+    /// - Returns: The index of the provided DataSet in the DataSet array of this data object, or -1 if it does not exist.
+    @objc open func indexOfDataSet(_ dataSet: IChartDataSet) -> Int
     {
-        for i in 0 ..< _dataSets.count
-        {
-            if _dataSets[i] === dataSet
-            {
-                return i
-            }
-        }
-        
-        return -1
+        // TODO: Return nil instead of -1
+        return _dataSets.firstIndex { $0 === dataSet } ?? -1
     }
     
-    /// - returns: The first DataSet from the datasets-array that has it's dependency on the left axis. Returns null if no DataSet with left dependency could be found.
-    open func getFirstLeft(dataSets: [IChartDataSet]) -> IChartDataSet?
+    /// - Returns: The first DataSet from the datasets-array that has it's dependency on the left axis. Returns null if no DataSet with left dependency could be found.
+    @objc open func getFirstLeft(dataSets: [IChartDataSet]) -> IChartDataSet?
     {
-        for dataSet in dataSets
-        {
-            if dataSet.axisDependency == .left
-            {
-                return dataSet
-            }
-        }
-        
-        return nil
+        return dataSets.first { $0.axisDependency == .left }
     }
     
-    /// - returns: The first DataSet from the datasets-array that has it's dependency on the right axis. Returns null if no DataSet with right dependency could be found.
-    open func getFirstRight(dataSets: [IChartDataSet]) -> IChartDataSet?
+    /// - Returns: The first DataSet from the datasets-array that has it's dependency on the right axis. Returns null if no DataSet with right dependency could be found.
+    @objc open func getFirstRight(dataSets: [IChartDataSet]) -> IChartDataSet?
     {
-        for dataSet in _dataSets
-        {
-            if dataSet.axisDependency == .right
-            {
-                return dataSet
-            }
-        }
-        
-        return nil
+        return dataSets.first { $0.axisDependency == .right }
     }
     
-    /// - returns: All colors used across all DataSet objects this object represents.
-    open func getColors() -> [NSUIColor]?
+    /// - Returns: All colors used across all DataSet objects this object represents.
+    @objc open func getColors() -> [NSUIColor]?
     {
-        var clrcnt = 0
-        
-        for i in 0 ..< _dataSets.count
-        {
-            clrcnt += _dataSets[i].colors.count
-        }
-        
-        var colors = [NSUIColor]()
-        
-        for i in 0 ..< _dataSets.count
-        {
-            let clrs = _dataSets[i].colors
-            
-            for clr in clrs
-            {
-                colors.append(clr)
-            }
-        }
-        
-        return colors
+        // TODO: Don't return nil
+        return _dataSets.flatMap { $0.colors }
     }
     
     /// Sets a custom IValueFormatter for all DataSets this data object contains.
-    open func setValueFormatter(_ formatter: IValueFormatter?)
+    @objc open func setValueFormatter(_ formatter: IValueFormatter)
     {
-        guard let formatter = formatter
-            else { return }
-        
-        for set in dataSets
-        {
-            set.valueFormatter = formatter
-        }
+        dataSets.forEach { $0.valueFormatter = formatter }
     }
     
     /// Sets the color of the value-text (color in which the value-labels are drawn) for all DataSets this data object contains.
-    open func setValueTextColor(_ color: NSUIColor!)
+    @objc open func setValueTextColor(_ color: NSUIColor)
     {
-        for set in dataSets
-        {
-            set.valueTextColor = color ?? set.valueTextColor
-        }
+        dataSets.forEach { $0.valueTextColor = color }
     }
     
     /// Sets the font for all value-labels for all DataSets this data object contains.
-    open func setValueFont(_ font: NSUIFont!)
+    @objc open func setValueFont(_ font: NSUIFont)
     {
-        for set in dataSets
-        {
-            set.valueFont = font ?? set.valueFont
-        }
+        dataSets.forEach { $0.valueFont = font }
     }
-    
+
     /// Enables / disables drawing values (value-text) for all DataSets this data object contains.
-    open func setDrawValues(_ enabled: Bool)
+    @objc open func setDrawValues(_ enabled: Bool)
     {
-        for set in dataSets
-        {
-            set.drawValuesEnabled = enabled
-        }
+        dataSets.forEach { $0.drawValuesEnabled = enabled }
     }
     
     /// Enables / disables highlighting values for all DataSets this data object contains.
     /// If set to true, this means that values can be highlighted programmatically or by touch gesture.
-    open var highlightEnabled: Bool
+    @objc open var highlightEnabled: Bool
     {
-        get
-        {
-            for set in dataSets
-            {
-                if !set.highlightEnabled
-                {
-                    return false
-                }
-            }
-            
-            return true
-        }
-        set
-        {
-            for set in dataSets
-            {
-                set.highlightEnabled = newValue
-            }
-        }
+        get { return dataSets.allSatisfy { $0.highlightEnabled } }
+        set { dataSets.forEach { $0.highlightEnabled = newValue } }
     }
     
     /// if true, value highlightning is enabled
-    open var isHighlightEnabled: Bool { return highlightEnabled }
+    @objc open var isHighlightEnabled: Bool { return highlightEnabled }
     
     /// Clears this data object from all DataSets and removes all Entries.
     /// Don't forget to invalidate the chart after this.
-    open func clearValues()
+    @objc open func clearValues()
     {
         dataSets.removeAll(keepingCapacity: false)
         notifyDataChanged()
     }
     
     /// Checks if this data object contains the specified DataSet. 
-    /// - returns: `true` if so, `false` ifnot.
-    open func contains(dataSet: IChartDataSet) -> Bool
+    ///
+    /// - Returns: `true` if so, `false` ifnot.
+    @objc open func contains(dataSet: IChartDataSet) -> Bool
     {
-        for set in dataSets
-        {
-            if set === dataSet
-            {
-                return true
-            }
-        }
-        
-        return false
+        return dataSets.contains { $0 === dataSet }
     }
     
-    /// - returns: The total entry count across all DataSet objects this data object contains.
-    open var entryCount: Int
+    /// The total entry count across all DataSet objects this data object contains.
+    @objc open var entryCount: Int
     {
-        var count = 0
-        
-        for set in _dataSets
-        {
-            count += set.entryCount
-        }
-        
-        return count
+        return _dataSets.reduce(0) { $0 + $1.entryCount }
     }
 
-    /// - returns: The DataSet object with the maximum number of entries or null if there are no DataSets.
-    open var maxEntryCountSet: IChartDataSet?
+    /// The DataSet object with the maximum number of entries or null if there are no DataSets.
+    @objc open var maxEntryCountSet: IChartDataSet?
     {
-        if _dataSets.count == 0
-        {
-            return nil
-        }
-        
-        var max = _dataSets[0]
-        
-        for set in _dataSets
-        {
-            if set.entryCount > max.entryCount
-            {
-                max = set
-            }
-        }
-        
-        return max
+        return dataSets.max { $0.entryCount < $1.entryCount }
     }
+
+    // MARK: - Accessibility
+
+    /// When the data entry labels are generated identifiers, set this property to prepend a string before each identifier
+    ///
+    /// For example, if a label is "#3", settings this property to "Item" allows it to be spoken as "Item #3"
+    @objc open var accessibilityEntryLabelPrefix: String?
+
+    /// When the data entry value requires a unit, use this property to append the string representation of the unit to the value
+    ///
+    /// For example, if a value is "44.1", setting this property to "m" allows it to be spoken as "44.1 m"
+    @objc open var accessibilityEntryLabelSuffix: String?
+
+    /// If the data entry value is a count, set this to true to allow plurals and other grammatical changes
+    /// **default**: false
+    @objc open var accessibilityEntryLabelSuffixIsCount: Bool = false
 }
diff --git a/Source/Charts/Data/Implementations/Standard/ChartDataEntry.swift b/Source/Charts/Data/Implementations/Standard/ChartDataEntry.swift
index fe3d0aeccb..3f29f964fc 100644
--- a/Source/Charts/Data/Implementations/Standard/ChartDataEntry.swift
+++ b/Source/Charts/Data/Implementations/Standard/ChartDataEntry.swift
@@ -11,10 +11,10 @@
 
 import Foundation
 
-open class ChartDataEntry: ChartDataEntryBase
+open class ChartDataEntry: ChartDataEntryBase, NSCopying
 {
     /// the x value
-    open var x = Double(0.0)
+    @objc open var x = 0.0
     
     public required init()
     {
@@ -22,71 +22,57 @@ open class ChartDataEntry: ChartDataEntryBase
     }
     
     /// An Entry represents one single entry in the chart.
-    /// - parameter x: the x value
-    /// - parameter y: the y value (the actual value of the entry)
-    public init(x: Double, y: Double)
+    ///
+    /// - Parameters:
+    ///   - x: the x value
+    ///   - y: the y value (the actual value of the entry)
+    @objc public init(x: Double, y: Double)
     {
         super.init(y: y)
-        
         self.x = x
     }
     
     /// An Entry represents one single entry in the chart.
-    /// - parameter x: the x value
-    /// - parameter y: the y value (the actual value of the entry)
-    /// - parameter data: Space for additional data this Entry represents.
+    ///
+    /// - Parameters:
+    ///   - x: the x value
+    ///   - y: the y value (the actual value of the entry)
+    ///   - data: Space for additional data this Entry represents.
     
-    public init(x: Double, y: Double, data: AnyObject?)
+    @objc public convenience init(x: Double, y: Double, data: Any?)
     {
-        super.init(y: y)
-        
-        self.x = x
-        
+        self.init(x: x, y: y)
         self.data = data
     }
     
     /// An Entry represents one single entry in the chart.
-    /// - parameter x: the x value
-    /// - parameter y: the y value (the actual value of the entry)
-    /// - parameter icon: icon image
+    ///
+    /// - Parameters:
+    ///   - x: the x value
+    ///   - y: the y value (the actual value of the entry)
+    ///   - icon: icon image
     
-    public init(x: Double, y: Double, icon: NSUIImage?)
+    @objc public convenience init(x: Double, y: Double, icon: NSUIImage?)
     {
-        super.init(y: y, icon: icon)
-        
-        self.x = x
+        self.init(x: x, y: y)
+        self.icon = icon
     }
     
     /// An Entry represents one single entry in the chart.
-    /// - parameter x: the x value
-    /// - parameter y: the y value (the actual value of the entry)
-    /// - parameter icon: icon image
-    /// - parameter data: Space for additional data this Entry represents.
-    
-    public init(x: Double, y: Double, icon: NSUIImage?, data: AnyObject?)
+    ///
+    /// - Parameters:
+    ///   - x: the x value
+    ///   - y: the y value (the actual value of the entry)
+    ///   - icon: icon image
+    ///   - data: Space for additional data this Entry represents.
+    
+    @objc public convenience init(x: Double, y: Double, icon: NSUIImage?, data: Any?)
     {
-        super.init(y: y, icon: icon, data: data)
-        
-        self.x = x
+        self.init(x: x, y: y)
+        self.icon = icon
+        self.data = data
     }
-    
-    // MARK: NSObject
-    
-    open override func isEqual(_ object: Any?) -> Bool
-    {
-        if !super.isEqual(object)
-        {
-            return false
-        }
         
-        if fabs((object! as AnyObject).x - x) > Double.ulpOfOne
-        {
-            return false
-        }
-        
-        return true
-    }
-    
     // MARK: NSObject
     
     open override var description: String
@@ -96,7 +82,7 @@ open class ChartDataEntry: ChartDataEntryBase
     
     // MARK: NSCopying
     
-    open func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open func copy(with zone: NSZone? = nil) -> Any
     {
         let copy = type(of: self).init()
         
@@ -108,32 +94,17 @@ open class ChartDataEntry: ChartDataEntryBase
     }
 }
 
-public func ==(lhs: ChartDataEntry, rhs: ChartDataEntry) -> Bool
-{
-    if lhs === rhs
-    {
-        return true
-    }
-    
-    if !lhs.isKind(of: type(of: rhs))
-    {
-        return false
-    }
-    
-    if lhs.data !== rhs.data && !lhs.data!.isEqual(rhs.data)
-    {
-        return false
-    }
-    
-    if fabs(lhs.x - rhs.x) > Double.ulpOfOne
-    {
-        return false
-    }
-    
-    if fabs(lhs.y - rhs.y) > Double.ulpOfOne
-    {
-        return false
+// MARK: Equatable
+extension ChartDataEntry/*: Equatable*/ {
+    open override func isEqual(_ object: Any?) -> Bool {
+        guard let object = object as? ChartDataEntry else { return false }
+
+        if self === object
+        {
+            return true
+        }
+
+        return y == object.y
+            && x == object.x
     }
-    
-    return true
 }
diff --git a/Source/Charts/Data/Implementations/Standard/ChartDataEntryBase.swift b/Source/Charts/Data/Implementations/Standard/ChartDataEntryBase.swift
index 36bb8e2725..2c9d0d5744 100644
--- a/Source/Charts/Data/Implementations/Standard/ChartDataEntryBase.swift
+++ b/Source/Charts/Data/Implementations/Standard/ChartDataEntryBase.swift
@@ -14,13 +14,13 @@ import Foundation
 open class ChartDataEntryBase: NSObject
 {
     /// the y value
-    open var y = Double(0.0)
+    @objc open var y = 0.0
     
     /// optional spot for additional data this Entry represents
-    open var data: AnyObject?
+    @objc open var data: Any?
     
     /// optional icon image
-    open var icon: NSUIImage?
+    @objc open var icon: NSUIImage?
     
     public override required init()
     {
@@ -28,76 +28,51 @@ open class ChartDataEntryBase: NSObject
     }
     
     /// An Entry represents one single entry in the chart.
-    /// - parameter y: the y value (the actual value of the entry)
-    public init(y: Double)
+    ///
+    /// - Parameters:
+    ///   - y: the y value (the actual value of the entry)
+    @objc public init(y: Double)
     {
         super.init()
         
         self.y = y
     }
     
-    /// - parameter y: the y value (the actual value of the entry)
-    /// - parameter data: Space for additional data this Entry represents.
+    /// - Parameters:
+    ///   - y: the y value (the actual value of the entry)
+    ///   - data: Space for additional data this Entry represents.
     
-    public init(y: Double, data: AnyObject?)
+    @objc public convenience init(y: Double, data: Any?)
     {
-        super.init()
+        self.init(y: y)
         
-        self.y = y
         self.data = data
     }
     
-    /// - parameter y: the y value (the actual value of the entry)
-    /// - parameter icon: icon image
+    /// - Parameters:
+    ///   - y: the y value (the actual value of the entry)
+    ///   - icon: icon image
     
-    public init(y: Double, icon: NSUIImage?)
+    @objc public convenience init(y: Double, icon: NSUIImage?)
     {
-        super.init()
-        
-        self.y = y
+        self.init(y: y)
+
         self.icon = icon
     }
     
-    /// - parameter y: the y value (the actual value of the entry)
-    /// - parameter icon: icon image
-    /// - parameter data: Space for additional data this Entry represents.
+    /// - Parameters:
+    ///   - y: the y value (the actual value of the entry)
+    ///   - icon: icon image
+    ///   - data: Space for additional data this Entry represents.
     
-    public init(y: Double, icon: NSUIImage?, data: AnyObject?)
+    @objc public convenience init(y: Double, icon: NSUIImage?, data: Any?)
     {
-        super.init()
-        
-        self.y = y
+        self.init(y: y)
+
         self.icon = icon
         self.data = data
     }
-    
-    // MARK: NSObject
-    
-    open override func isEqual(_ object: Any?) -> Bool
-    {
-        if object == nil
-        {
-            return false
-        }
-        
-        if !(object! as AnyObject).isKind(of: type(of: self))
-        {
-            return false
-        }
-        
-        if (object! as AnyObject).data !== data && !((object! as AnyObject).data??.isEqual(self.data))!
-        {
-            return false
-        }
-        
-        if fabs((object! as AnyObject).y - y) > Double.ulpOfOne
-        {
-            return false
-        }
-        
-        return true
-    }
-    
+
     // MARK: NSObject
     
     open override var description: String
@@ -106,27 +81,16 @@ open class ChartDataEntryBase: NSObject
     }
 }
 
-public func ==(lhs: ChartDataEntryBase, rhs: ChartDataEntryBase) -> Bool
-{
-    if lhs === rhs
-    {
-        return true
-    }
-    
-    if !lhs.isKind(of: type(of: rhs))
-    {
-        return false
-    }
-    
-    if lhs.data !== rhs.data && !lhs.data!.isEqual(rhs.data)
-    {
-        return false
-    }
-    
-    if fabs(lhs.y - rhs.y) > Double.ulpOfOne
-    {
-        return false
+// MARK: Equatable
+extension ChartDataEntryBase/*: Equatable*/ {
+    open override func isEqual(_ object: Any?) -> Bool {
+        guard let object = object as? ChartDataEntryBase else { return false }
+
+        if self === object
+        {
+            return true
+        }
+
+        return y == object.y
     }
-    
-    return true
 }
diff --git a/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift
index 15183d827b..9922878da8 100644
--- a/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/ChartDataSet.swift
@@ -26,37 +26,53 @@ open class ChartDataSet: ChartBaseDataSet
 {
     public required init()
     {
+        entries = []
+
         super.init()
-        
-        _values = [ChartDataEntry]()
     }
     
-    public override init(label: String?)
+    public override convenience init(label: String?)
     {
-        super.init(label: label)
-        
-        _values = [ChartDataEntry]()
+        self.init(entries: nil, label: label)
     }
     
-    public init(values: [ChartDataEntry]?, label: String?)
+    @objc public init(entries: [ChartDataEntry]?, label: String?)
     {
+        self.entries = entries ?? []
+
         super.init(label: label)
-        
-        _values = values == nil ? [ChartDataEntry]() : values
-        
+
         self.calcMinMax()
     }
     
-    public convenience init(values: [ChartDataEntry]?)
+    @objc public convenience init(entries: [ChartDataEntry]?)
     {
-        self.init(values: values, label: "DataSet")
+        self.init(entries: entries, label: "DataSet")
     }
     
     // MARK: - Data functions and accessors
-    
+
+    /// - Note: Calls `notifyDataSetChanged()` after setting a new value.
+    /// - Returns: The array of y-values that this DataSet represents.
     /// the entries that this dataset represents / holds together
-    internal var _values: [ChartDataEntry]!
-    
+    @available(*, unavailable, renamed: "entries")
+    @objc
+    open var values: [ChartDataEntry] { return entries }
+
+    @objc
+    open private(set) var entries: [ChartDataEntry]
+
+    /// Used to replace all entries of a data set while retaining styling properties.
+    /// This is a separate method from a setter on `entries` to encourage usage
+    /// of `Collection` conformances.
+    ///
+    /// - Parameter entries: new entries to replace existing entries in the dataset
+    @objc
+    public func replaceEntries(_ entries: [ChartDataEntry]) {
+        self.entries = entries
+        notifyDataSetChanged()
+    }
+
     /// maximum y-value in the value array
     internal var _yMax: Double = -Double.greatestFiniteMagnitude
     
@@ -69,69 +85,34 @@ open class ChartDataSet: ChartBaseDataSet
     /// minimum x-value in the value array
     internal var _xMin: Double = Double.greatestFiniteMagnitude
     
-    /// *
-    /// - note: Calls `notifyDataSetChanged()` after setting a new value.
-    /// - returns: The array of y-values that this DataSet represents.
-    open var values: [ChartDataEntry]
-    {
-        get
-        {
-            return _values
-        }
-        set
-        {
-            _values = newValue
-            notifyDataSetChanged()
-        }
-    }
-    
-    /// Use this method to tell the data set that the underlying data has changed
-    open override func notifyDataSetChanged()
-    {
-        calcMinMax()
-    }
-    
     open override func calcMinMax()
     {
-        if _values.count == 0
-        {
-            return
-        }
-        
         _yMax = -Double.greatestFiniteMagnitude
         _yMin = Double.greatestFiniteMagnitude
         _xMax = -Double.greatestFiniteMagnitude
         _xMin = Double.greatestFiniteMagnitude
-        
-        for e in _values
-        {
-            calcMinMax(entry: e)
-        }
+
+        guard !isEmpty else { return }
+
+        forEach(calcMinMax)
     }
     
     open override func calcMinMaxY(fromX: Double, toX: Double)
     {
-        if _values.count == 0
-        {
-            return
-        }
-        
         _yMax = -Double.greatestFiniteMagnitude
         _yMin = Double.greatestFiniteMagnitude
+
+        guard !isEmpty else { return }
         
         let indexFrom = entryIndex(x: fromX, closestToY: Double.nan, rounding: .down)
         let indexTo = entryIndex(x: toX, closestToY: Double.nan, rounding: .up)
         
-        if indexTo < indexFrom { return }
-        
-        for i in indexFrom...indexTo
-        {
-            // only recalculate y
-            calcMinMaxY(entry: _values[i])
-        }
+        guard !(indexTo < indexFrom) else { return }
+        // only recalculate y
+        self[indexFrom...indexTo].forEach(calcMinMaxY)
     }
     
-    open func calcMinMaxX(entry e: ChartDataEntry)
+    @objc open func calcMinMaxX(entry e: ChartDataEntry)
     {
         if e.x < _xMin
         {
@@ -143,7 +124,7 @@ open class ChartDataSet: ChartBaseDataSet
         }
     }
     
-    open func calcMinMaxY(entry e: ChartDataEntry)
+    @objc open func calcMinMaxY(entry e: ChartDataEntry)
     {
         if e.y < _yMin
         {
@@ -157,63 +138,68 @@ open class ChartDataSet: ChartBaseDataSet
     
     /// Updates the min and max x and y value of this DataSet based on the given Entry.
     ///
-    /// - parameter e:
+    /// - Parameters:
+    ///   - e:
     internal func calcMinMax(entry e: ChartDataEntry)
     {
         calcMinMaxX(entry: e)
         calcMinMaxY(entry: e)
     }
     
-    /// - returns: The minimum y-value this DataSet holds
+    /// The minimum y-value this DataSet holds
     open override var yMin: Double { return _yMin }
     
-    /// - returns: The maximum y-value this DataSet holds
+    /// The maximum y-value this DataSet holds
     open override var yMax: Double { return _yMax }
     
-    /// - returns: The minimum x-value this DataSet holds
+    /// The minimum x-value this DataSet holds
     open override var xMin: Double { return _xMin }
     
-    /// - returns: The maximum x-value this DataSet holds
+    /// The maximum x-value this DataSet holds
     open override var xMax: Double { return _xMax }
     
-    /// - returns: The number of y-values this DataSet represents
-    open override var entryCount: Int { return _values?.count ?? 0 }
+    /// The number of y-values this DataSet represents
+    @available(*, deprecated, message: "Use `count` instead")
+    open override var entryCount: Int { return count }
     
-    /// - returns: The entry object found at the given index (not x-value!)
-    /// - throws: out of bounds
+    /// - Throws: out of bounds
     /// if `i` is out of bounds, it may throw an out-of-bounds exception
+    /// - Returns: The entry object found at the given index (not x-value!)
+    @available(*, deprecated, message: "Use `subscript(index:)` instead.")
     open override func entryForIndex(_ i: Int) -> ChartDataEntry?
     {
-        guard i >= 0 && i < _values.count else {
+        guard i >= startIndex, i < endIndex else {
             return nil
         }
-        return _values[i]
+        return self[i]
     }
     
-    /// - returns: The first Entry object found at the given x-value with binary search.
+    /// - Parameters:
+    ///   - xValue: the x-value
+    ///   - closestToY: If there are multiple y-values for the specified x-value,
+    ///   - rounding: determine whether to round up/down/closest if there is no Entry matching the provided x-value
+    /// - Returns: The first Entry object found at the given x-value with binary search.
     /// If the no Entry at the specified x-value is found, this method returns the Entry at the closest x-value according to the rounding.
     /// nil if no Entry object at that x-value.
-    /// - parameter xValue: the x-value
-    /// - parameter closestToY: If there are multiple y-values for the specified x-value,
-    /// - parameter rounding: determine whether to round up/down/closest if there is no Entry matching the provided x-value
     open override func entryForXValue(
         _ xValue: Double,
         closestToY yValue: Double,
         rounding: ChartDataSetRounding) -> ChartDataEntry?
     {
-        let index = self.entryIndex(x: xValue, closestToY: yValue, rounding: rounding)
+        let index = entryIndex(x: xValue, closestToY: yValue, rounding: rounding)
         if index > -1
         {
-            return _values[index]
+            return self[index]
         }
         return nil
     }
     
-    /// - returns: The first Entry object found at the given x-value with binary search.
+    /// - Parameters:
+    ///   - xValue: the x-value
+    ///   - closestToY: If there are multiple y-values for the specified x-value,
+    /// - Returns: The first Entry object found at the given x-value with binary search.
     /// If the no Entry at the specified x-value is found, this method returns the Entry at the closest x-value.
     /// nil if no Entry object at that x-value.
-    /// - parameter xValue: the x-value
-    /// - parameter closestToY: If there are multiple y-values for the specified x-value,
     open override func entryForXValue(
         _ xValue: Double,
         closestToY yValue: Double) -> ChartDataEntry?
@@ -221,34 +207,34 @@ open class ChartDataSet: ChartBaseDataSet
         return entryForXValue(xValue, closestToY: yValue, rounding: .closest)
     }
     
-    /// - returns: All Entry objects found at the given xIndex with binary search.
+    /// - Returns: All Entry objects found at the given xIndex with binary search.
     /// An empty array if no Entry object at that index.
     open override func entriesForXValue(_ xValue: Double) -> [ChartDataEntry]
     {
         var entries = [ChartDataEntry]()
         
-        var low = 0
-        var high = _values.count - 1
+        var low = startIndex
+        var high = endIndex - 1
         
         while low <= high
         {
             var m = (high + low) / 2
-            var entry = _values[m]
+            var entry = self[m]
             
             // if we have a match
             if xValue == entry.x
             {
-                while m > 0 && _values[m - 1].x == xValue
+                while m > 0 && self[m - 1].x == xValue
                 {
                     m -= 1
                 }
                 
-                high = _values.count
+                high = endIndex
                 
                 // loop over all "equal" entries
                 while m < high
                 {
-                    entry = _values[m]
+                    entry = self[m]
                     if entry.x == xValue
                     {
                         entries.append(entry)
@@ -279,27 +265,27 @@ open class ChartDataSet: ChartBaseDataSet
         return entries
     }
     
-    /// - returns: The array-index of the specified entry.
+    /// - Parameters:
+    ///   - xValue: x-value of the entry to search for
+    ///   - closestToY: If there are multiple y-values for the specified x-value,
+    ///   - rounding: Rounding method if exact value was not found
+    /// - Returns: The array-index of the specified entry.
     /// If the no Entry at the specified x-value is found, this method returns the index of the Entry at the closest x-value according to the rounding.
-    ///
-    /// - parameter xValue: x-value of the entry to search for
-    /// - parameter closestToY: If there are multiple y-values for the specified x-value,
-    /// - parameter rounding: Rounding method if exact value was not found
     open override func entryIndex(
         x xValue: Double,
         closestToY yValue: Double,
         rounding: ChartDataSetRounding) -> Int
     {
-        var low = 0
-        var high = _values.count - 1
+        var low = startIndex
+        var high = endIndex - 1
         var closest = high
         
         while low < high
         {
             let m = (low + high) / 2
             
-            let d1 = _values[m].x - xValue
-            let d2 = _values[m + 1].x - xValue
+            let d1 = self[m].x - xValue
+            let d2 = self[m + 1].x - xValue
             let ad1 = abs(d1), ad2 = abs(d2)
             
             if ad2 < ad1
@@ -335,12 +321,12 @@ open class ChartDataSet: ChartBaseDataSet
         
         if closest != -1
         {
-            let closestXValue = _values[closest].x
+            let closestXValue = self[closest].x
             
             if rounding == .up
             {
                 // If rounding up, and found x-value is lower than specified x, and we can go upper...
-                if closestXValue < xValue && closest < _values.count - 1
+                if closestXValue < xValue && closest < endIndex - 1
                 {
                     closest += 1
                 }
@@ -357,23 +343,23 @@ open class ChartDataSet: ChartBaseDataSet
             // Search by closest to y-value
             if !yValue.isNaN
             {
-                while closest > 0 && _values[closest - 1].x == closestXValue
+                while closest > 0 && self[closest - 1].x == closestXValue
                 {
                     closest -= 1
                 }
                 
-                var closestYValue = _values[closest].y
+                var closestYValue = self[closest].y
                 var closestYIndex = closest
                 
                 while true
                 {
                     closest += 1
-                    if closest >= _values.count { break }
+                    if closest >= endIndex { break }
                     
-                    let value = _values[closest]
+                    let value = self[closest]
                     
                     if value.x != closestXValue { break }
-                    if abs(value.y - yValue) < abs(closestYValue - yValue)
+                    if abs(value.y - yValue) <= abs(closestYValue - yValue)
                     {
                         closestYValue = yValue
                         closestYIndex = closest
@@ -387,168 +373,202 @@ open class ChartDataSet: ChartBaseDataSet
         return closest
     }
     
-    /// - returns: The array-index of the specified entry
-    ///
-    /// - parameter e: the entry to search for
+    /// - Parameters:
+    ///   - e: the entry to search for
+    /// - Returns: The array-index of the specified entry
+    @available(*, deprecated, message: "Use `firstIndex(of:)` or `lastIndex(of:)`")
     open override func entryIndex(entry e: ChartDataEntry) -> Int
     {
-        for i in 0 ..< _values.count
-        {
-            if _values[i] === e
-            {
-                return i
-            }
-        }
-        
-        return -1
+        return firstIndex(of: e) ?? -1
     }
     
     /// Adds an Entry to the DataSet dynamically.
     /// Entries are added to the end of the list.
     /// This will also recalculate the current minimum and maximum values of the DataSet and the value-sum.
-    /// - parameter e: the entry to add
-    /// - returns: True
+    ///
+    /// - Parameters:
+    ///   - e: the entry to add
+    /// - Returns: True
+    @available(*, deprecated, message: "Use `append(_:)` instead")
     open override func addEntry(_ e: ChartDataEntry) -> Bool
     {
-        if _values == nil
-        {
-            _values = [ChartDataEntry]()
-        }
-        
-        calcMinMax(entry: e)
-        
-        _values.append(e)
-        
+        append(e)
         return true
     }
     
     /// Adds an Entry to the DataSet dynamically.
     /// Entries are added to their appropriate index respective to it's x-index.
     /// This will also recalculate the current minimum and maximum values of the DataSet and the value-sum.
-    /// - parameter e: the entry to add
-    /// - returns: True
+    ///
+    /// - Parameters:
+    ///   - e: the entry to add
+    /// - Returns: True
     open override func addEntryOrdered(_ e: ChartDataEntry) -> Bool
     {
-        if _values == nil
-        {
-            _values = [ChartDataEntry]()
-        }
-        
         calcMinMax(entry: e)
         
-        if _values.count > 0 && _values.last!.x > e.x
+        if let last = last, last.x > e.x
         {
             var closestIndex = entryIndex(x: e.x, closestToY: e.y, rounding: .up)
-            while _values[closestIndex].x < e.x
+            while self[closestIndex].x < e.x
             {
                 closestIndex += 1
             }
-            _values.insert(e, at: closestIndex)
+            entries.insert(e, at: closestIndex)
         }
         else
         {
-            _values.append(e)
+            append(e)
         }
         
         return true
     }
     
+    @available(*, renamed: "remove(_:)")
+    open override func removeEntry(_ entry: ChartDataEntry) -> Bool
+    {
+        return remove(entry)
+    }
+
     /// Removes an Entry from the DataSet dynamically.
     /// This will also recalculate the current minimum and maximum values of the DataSet and the value-sum.
-    /// - parameter entry: the entry to remove
-    /// - returns: `true` if the entry was removed successfully, else if the entry does not exist
-    open override func removeEntry(_ entry: ChartDataEntry) -> Bool
+    ///
+    /// - Parameters:
+    ///   - entry: the entry to remove
+    /// - Returns: `true` if the entry was removed successfully, else if the entry does not exist
+    open func remove(_ entry: ChartDataEntry) -> Bool
     {
-        var removed = false
-        
-        for i in 0 ..< _values.count
-        {
-            if _values[i] === entry
-            {
-                _values.remove(at: i)
-                removed = true
-                break
-            }
-        }
-        
-        if removed
-        {
-            calcMinMax()
-        }
-        
-        return removed
+        guard let index = firstIndex(of: entry) else { return false }
+        _ = remove(at: index)
+        return true
     }
-    
+
     /// Removes the first Entry (at index 0) of this DataSet from the entries array.
     ///
-    /// - returns: `true` if successful, `false` ifnot.
+    /// - Returns: `true` if successful, `false` if not.
+    @available(*, deprecated, message: "Use `func removeFirst() -> ChartDataEntry` instead.")
     open override func removeFirst() -> Bool
     {
-        let entry: ChartDataEntry? = _values.isEmpty ? nil : _values.removeFirst()
-        
-        let removed = entry != nil
-        
-        if removed
-        {
-            calcMinMax()
-        }
-        
-        return removed
+        let entry: ChartDataEntry? = isEmpty ? nil : removeFirst()
+        return entry != nil
     }
     
     /// Removes the last Entry (at index size-1) of this DataSet from the entries array.
     ///
-    /// - returns: `true` if successful, `false` ifnot.
+    /// - Returns: `true` if successful, `false` if not.
+    @available(*, deprecated, message: "Use `func removeLast() -> ChartDataEntry` instead.")
     open override func removeLast() -> Bool
     {
-        let entry: ChartDataEntry? = _values.isEmpty ? nil : _values.removeLast()
-        
-        let removed = entry != nil
-        
-        if removed
-        {
-            calcMinMax()
-        }
-        
-        return removed
-    }
-    
-    /// Checks if this DataSet contains the specified Entry.
-    /// - returns: `true` if contains the entry, `false` ifnot.
-    open override func contains(_ e: ChartDataEntry) -> Bool
-    {
-        for entry in _values
-        {
-            if (entry.isEqual(e))
-            {
-                return true
-            }
-        }
-        
-        return false
+        let entry: ChartDataEntry? = isEmpty ? nil : removeLast()
+        return entry != nil
     }
-    
+
     /// Removes all values from this DataSet and recalculates min and max value.
+    @available(*, deprecated, message: "Use `removeAll(keepingCapacity:)` instead.")
     open override func clear()
     {
-        _values.removeAll(keepingCapacity: true)
-        notifyDataSetChanged()
+        removeAll(keepingCapacity: true)
     }
     
     // MARK: - Data functions and accessors
 
     // MARK: - NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! ChartDataSet
+        let copy = super.copy(with: zone) as! ChartDataSet
         
-        copy._values = _values
+        copy.entries = entries
         copy._yMax = _yMax
         copy._yMin = _yMin
+        copy._xMax = _xMax
+        copy._xMin = _xMin
 
         return copy
     }
 }
 
+// MARK: MutableCollection
+extension ChartDataSet: MutableCollection {
+    public typealias Index = Int
+    public typealias Element = ChartDataEntry
+
+    public var startIndex: Index {
+        return entries.startIndex
+    }
+
+    public var endIndex: Index {
+        return entries.endIndex
+    }
+
+    public func index(after: Index) -> Index {
+        return entries.index(after: after)
+    }
+
+    @objc
+    public subscript(position: Index) -> Element {
+        get {
+            // This is intentionally not a safe subscript to mirror
+            // the behaviour of the built in Swift Collection Types
+            return entries[position]
+        }
+        set {
+            calcMinMax(entry: newValue)
+            entries[position] = newValue
+        }
+    }
+}
+
+// MARK: RandomAccessCollection
+extension ChartDataSet: RandomAccessCollection {
+    public func index(before: Index) -> Index {
+        return entries.index(before: before)
+    }
+}
+
+// MARK: RangeReplaceableCollection
+extension ChartDataSet: RangeReplaceableCollection {
+    public func append(_ newElement: Element) {
+        calcMinMax(entry: newElement)
+        entries.append(newElement)
+    }
+
+    public func remove(at position: Index) -> Element {
+        let element = entries.remove(at: position)
+        notifyDataSetChanged()
+        return element
+    }
+
+    public func removeFirst() -> Element {
+        let element = entries.removeFirst()
+        notifyDataSetChanged()
+        return element
+    }
+
+    public func removeFirst(_ n: Int) {
+        entries.removeFirst(n)
+        notifyDataSetChanged()
+    }
 
+    public func removeLast() -> Element {
+        let element = entries.removeLast()
+        notifyDataSetChanged()
+        return element
+    }
+
+    public func removeLast(_ n: Int) {
+        entries.removeLast(n)
+        notifyDataSetChanged()
+    }
+
+    public func removeSubrange<R>(_ bounds: R) where R : RangeExpression, Index == R.Bound {
+        entries.removeSubrange(bounds)
+        notifyDataSetChanged()
+    }
+
+    @objc
+    public func removeAll(keepingCapacity keepCapacity: Bool) {
+        entries.removeAll(keepingCapacity: keepCapacity)
+        notifyDataSetChanged()
+    }
+}
diff --git a/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift b/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift
index d356d32994..e883c8b7f3 100644
--- a/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift
+++ b/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift
@@ -13,11 +13,11 @@ import Foundation
 
 open class CombinedChartData: BarLineScatterCandleBubbleChartData
 {
-    fileprivate var _lineData: LineChartData!
-    fileprivate var _barData: BarChartData!
-    fileprivate var _scatterData: ScatterChartData!
-    fileprivate var _candleData: CandleChartData!
-    fileprivate var _bubbleData: BubbleChartData!
+    private var _lineData: LineChartData!
+    private var _barData: BarChartData!
+    private var _scatterData: ScatterChartData!
+    private var _candleData: CandleChartData!
+    private var _bubbleData: BubbleChartData!
     
     public override init()
     {
@@ -29,7 +29,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
         super.init(dataSets: dataSets)
     }
     
-    open var lineData: LineChartData!
+    @objc open var lineData: LineChartData!
     {
         get
         {
@@ -42,7 +42,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
         }
     }
     
-    open var barData: BarChartData!
+    @objc open var barData: BarChartData!
     {
         get
         {
@@ -55,7 +55,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
         }
     }
     
-    open var scatterData: ScatterChartData!
+    @objc open var scatterData: ScatterChartData!
     {
         get
         {
@@ -68,7 +68,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
         }
     }
     
-    open var candleData: CandleChartData!
+    @objc open var candleData: CandleChartData!
     {
         get
         {
@@ -81,7 +81,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
         }
     }
     
-    open var bubbleData: BubbleChartData!
+    @objc open var bubbleData: BubbleChartData!
     {
         get
         {
@@ -136,31 +136,37 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
             {
                 _xMin = data.xMin
             }
-            
-            if data.yMax > _leftAxisMax
-            {
-                _leftAxisMax = data.yMax
-            }
-            
-            if data.yMin < _leftAxisMin
-            {
-                _leftAxisMin = data.yMin
-            }
-            
-            if data.yMax > _rightAxisMax
-            {
-                _rightAxisMax = data.yMax
-            }
-            
-            if data.yMin < _rightAxisMin
+
+            for dataset in sets
             {
-                _rightAxisMin = data.yMin
+                if dataset.axisDependency == .left
+                {
+                    if dataset.yMax > _leftAxisMax
+                    {
+                        _leftAxisMax = dataset.yMax
+                    }
+                    if dataset.yMin < _leftAxisMin
+                    {
+                        _leftAxisMin = dataset.yMin
+                    }
+                }
+                else
+                {
+                    if dataset.yMax > _rightAxisMax
+                    {
+                        _rightAxisMax = dataset.yMax
+                    }
+                    if dataset.yMin < _rightAxisMin
+                    {
+                        _rightAxisMin = dataset.yMin
+                    }
+                }
             }
         }
     }
     
-    /// - returns: All data objects in row: line-bar-scatter-candle-bubble if not null.
-    open var allData: [ChartData]
+    /// All data objects in row: line-bar-scatter-candle-bubble if not null.
+    @objc open var allData: [ChartData]
     {
         var data = [ChartData]()
         
@@ -188,33 +194,19 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
         return data
     }
     
-    open func dataByIndex(_ index: Int) -> ChartData
+    @objc open func dataByIndex(_ index: Int) -> ChartData
     {
         return allData[index]
     }
     
     open func dataIndex(_ data: ChartData) -> Int?
     {
-        return allData.index(of: data)
+        return allData.firstIndex(of: data)
     }
     
-    open override func removeDataSet(_ dataSet: IChartDataSet!) -> Bool
+    open override func removeDataSet(_ dataSet: IChartDataSet) -> Bool
     {
-        let datas = allData
-        
-        var success = false
-        
-        for data in datas
-        {
-            success = data.removeDataSet(dataSet)
-            
-            if success
-            {
-                break
-            }
-        }
-        
-        return success
+        return allData.contains { $0.removeDataSet(dataSet) }
     }
     
     open override func removeDataSetByIndex(_ index: Int) -> Bool
@@ -261,39 +253,49 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
         super.notifyDataChanged() // recalculate everything
     }
     
-    
     /// Get the Entry for a corresponding highlight object
     ///
-    /// - parameter highlight:
-    /// - returns: The entry that is highlighted
+    /// - Parameters:
+    ///   - highlight:
+    /// - Returns: The entry that is highlighted
     open override func entryForHighlight(_ highlight: Highlight) -> ChartDataEntry?
     {
-        let dataObjects = allData
-        
-        if highlight.dataIndex >= dataObjects.count
+        if highlight.dataIndex >= allData.count
         {
             return nil
         }
         
-        let data = dataObjects[highlight.dataIndex]
+        let data = dataByIndex(highlight.dataIndex)
         
         if highlight.dataSetIndex >= data.dataSetCount
         {
             return nil
         }
-        else
+        
+        // The value of the highlighted entry could be NaN - if we are not interested in highlighting a specific value.
+        let entries = data.getDataSetByIndex(highlight.dataSetIndex).entriesForXValue(highlight.x)
+        return entries.first { $0.y == highlight.y || highlight.y.isNaN }
+    }
+    
+    /// Get dataset for highlight
+    ///
+    /// - Parameters:
+    ///   - highlight: current highlight
+    /// - Returns: dataset related to highlight
+    @objc open func getDataSetByHighlight(_ highlight: Highlight) -> IChartDataSet!
+    {  
+        if highlight.dataIndex >= allData.count
+        {
+            return nil
+        }
+        
+        let data = dataByIndex(highlight.dataIndex)
+        
+        if highlight.dataSetIndex >= data.dataSetCount
         {
-            // The value of the highlighted entry could be NaN - if we are not interested in highlighting a specific value.
-            let entries = data.getDataSetByIndex(highlight.dataSetIndex).entriesForXValue(highlight.x)
-            for e in entries
-            {
-                if e.y == highlight.y || highlight.y.isNaN
-                {
-                    return e
-                }
-            }
-            
             return nil
         }
+        
+        return data.dataSets[highlight.dataSetIndex]
     }
 }
diff --git a/Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift
index 391bba48a1..b53ddd4d05 100644
--- a/Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift
@@ -24,7 +24,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
         case horizontalBezier
     }
     
-    fileprivate func initialize()
+    private func initialize()
     {
         // default color
         circleColors.append(NSUIColor(red: 140.0/255.0, green: 234.0/255.0, blue: 255.0/255.0, alpha: 1.0))
@@ -36,9 +36,9 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
         initialize()
     }
     
-    public override init(values: [ChartDataEntry]?, label: String?)
+    public override init(entries: [ChartDataEntry]?, label: String?)
     {
-        super.init(values: values, label: label)
+        super.init(entries: entries, label: label)
         initialize()
     }
     
@@ -51,7 +51,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
     /// **default**: Linear
     open var mode: Mode = Mode.linear
     
-    fileprivate var _cubicIntensity = CGFloat(0.2)
+    private var _cubicIntensity = CGFloat(0.2)
     
     /// Intensity for cubic lines (min = 0.05, max = 1)
     ///
@@ -64,50 +64,10 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
         }
         set
         {
-            _cubicIntensity = newValue
-            if _cubicIntensity > 1.0
-            {
-                _cubicIntensity = 1.0
-            }
-            if _cubicIntensity < 0.05
-            {
-                _cubicIntensity = 0.05
-            }
+            _cubicIntensity = newValue.clamped(to: 0.05...1)
         }
     }
-    
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    open var drawCubicEnabled: Bool
-    {
-        get
-        {
-            return mode == .cubicBezier
-        }
-        set
-        {
-            mode = newValue ? LineChartDataSet.Mode.cubicBezier : LineChartDataSet.Mode.linear
-        }
-    }
-    
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    open var isDrawCubicEnabled: Bool { return drawCubicEnabled }
-    
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    open var drawSteppedEnabled: Bool
-    {
-        get
-        {
-            return mode == .stepped
-        }
-        set
-        {
-            mode = newValue ? LineChartDataSet.Mode.stepped : LineChartDataSet.Mode.linear
-        }
-    }
-    
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    open var isDrawSteppedEnabled: Bool { return drawSteppedEnabled }
-    
+        
     /// The radius of the drawn circles.
     open var circleRadius = CGFloat(8.0)
     
@@ -116,7 +76,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
     
     open var circleColors = [NSUIColor]()
     
-    /// - returns: The color at the given index of the DataSet's circle-color array.
+    /// - Returns: The color at the given index of the DataSet's circle-color array.
     /// Performs a IndexOutOfBounds check by modulus.
     open func getCircleColor(atIndex index: Int) -> NSUIColor?
     {
@@ -152,7 +112,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
     /// If true, drawing circles is enabled
     open var drawCirclesEnabled = true
     
-    /// - returns: `true` if drawing circles for this DataSet is enabled, `false` ifnot
+    /// `true` if drawing circles for this DataSet is enabled, `false` ifnot
     open var isDrawCirclesEnabled: Bool { return drawCirclesEnabled }
     
     /// The color of the inner circle (the circle-hole).
@@ -161,7 +121,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
     /// `true` if drawing circles for this DataSet is enabled, `false` ifnot
     open var drawCircleHoleEnabled = true
     
-    /// - returns: `true` if drawing the circle-holes is enabled, `false` ifnot.
+    /// `true` if drawing the circle-holes is enabled, `false` ifnot.
     open var isDrawCircleHoleEnabled: Bool { return drawCircleHoleEnabled }
     
     /// This is how much (in pixels) into the dash pattern are we starting from.
@@ -176,7 +136,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
     open var lineCapType = CGLineCap.butt
     
     /// formatter for customizing the position of the fill-line
-    fileprivate var _fillFormatter: IFillFormatter = DefaultFillFormatter()
+    private var _fillFormatter: IFillFormatter = DefaultFillFormatter()
     
     /// Sets a custom IFillFormatter to the chart that handles the position of the filled-line for each DataSet. Set this to null to use the default logic.
     open var fillFormatter: IFillFormatter?
@@ -187,24 +147,19 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
         }
         set
         {
-            if newValue == nil
-            {
-                _fillFormatter = DefaultFillFormatter()
-            }
-            else
-            {
-                _fillFormatter = newValue!
-            }
+            _fillFormatter = newValue ?? DefaultFillFormatter()
         }
     }
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! LineChartDataSet
+        let copy = super.copy(with: zone) as! LineChartDataSet
         copy.circleColors = circleColors
+        copy.circleHoleColor = circleHoleColor
         copy.circleRadius = circleRadius
+        copy.circleHoleRadius = circleHoleRadius
         copy.cubicIntensity = cubicIntensity
         copy.lineDashPhase = lineDashPhase
         copy.lineDashLengths = lineDashLengths
@@ -212,6 +167,7 @@ open class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
         copy.drawCirclesEnabled = drawCirclesEnabled
         copy.drawCircleHoleEnabled = drawCircleHoleEnabled
         copy.mode = mode
+        copy._fillFormatter = _fillFormatter
         return copy
     }
 }
diff --git a/Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift
index 2fecce9551..b400f10000 100755
--- a/Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift
@@ -20,7 +20,7 @@ open class LineRadarChartDataSet: LineScatterCandleRadarChartDataSet, ILineRadar
     // MARK: - Styling functions and accessors
     
     /// The color that is used for filling the line surface area.
-    fileprivate var _fillColor = NSUIColor(red: 140.0/255.0, green: 234.0/255.0, blue: 255.0/255.0, alpha: 1.0)
+    private var _fillColor = NSUIColor(red: 140.0/255.0, green: 234.0/255.0, blue: 255.0/255.0, alpha: 1.0)
     
     /// The color that is used for filling the line surface area.
     open var fillColor: NSUIColor
@@ -41,7 +41,7 @@ open class LineRadarChartDataSet: LineScatterCandleRadarChartDataSet, ILineRadar
     /// **default**: 0.33
     open var fillAlpha = CGFloat(0.33)
     
-    fileprivate var _lineWidth = CGFloat(1.0)
+    private var _lineWidth = CGFloat(1.0)
     
     /// line width of the chart (min = 0.2, max = 10)
     ///
@@ -54,18 +54,7 @@ open class LineRadarChartDataSet: LineScatterCandleRadarChartDataSet, ILineRadar
         }
         set
         {
-            if newValue < 0.2
-            {
-                _lineWidth = 0.2
-            }
-            else if newValue > 10.0
-            {
-                _lineWidth = 10.0
-            }
-            else
-            {
-                _lineWidth = newValue
-            }
+            _lineWidth = newValue.clamped(to: 0...10)
         }
     }
     
@@ -74,7 +63,7 @@ open class LineRadarChartDataSet: LineScatterCandleRadarChartDataSet, ILineRadar
     /// Please note that this method uses the path clipping for drawing the filled area (with images, gradients and layers).
     open var drawFilledEnabled = false
     
-    /// - returns: `true` if filled drawing is enabled, `false` ifnot
+    /// `true` if filled drawing is enabled, `false` ifnot
     open var isDrawFilledEnabled: Bool
     {
         return drawFilledEnabled
@@ -82,10 +71,12 @@ open class LineRadarChartDataSet: LineScatterCandleRadarChartDataSet, ILineRadar
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! LineRadarChartDataSet
-        copy.fillColor = fillColor
+        let copy = super.copy(with: zone) as! LineRadarChartDataSet
+        copy.fill = fill
+        copy.fillAlpha = fillAlpha
+        copy._fillColor = _fillColor
         copy._lineWidth = _lineWidth
         copy.drawFilledEnabled = drawFilledEnabled
         return copy
diff --git a/Source/Charts/Data/Implementations/Standard/LineScatterCandleRadarChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/LineScatterCandleRadarChartDataSet.swift
index b21868ab08..1c68983bbc 100644
--- a/Source/Charts/Data/Implementations/Standard/LineScatterCandleRadarChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/LineScatterCandleRadarChartDataSet.swift
@@ -24,10 +24,10 @@ open class LineScatterCandleRadarChartDataSet: BarLineScatterCandleBubbleChartDa
     /// Enables / disables the vertical highlight-indicator. If disabled, the indicator is not drawn.
     open var drawVerticalHighlightIndicatorEnabled = true
     
-    /// - returns: `true` if horizontal highlight indicator lines are enabled (drawn)
+    /// `true` if horizontal highlight indicator lines are enabled (drawn)
     open var isHorizontalHighlightIndicatorEnabled: Bool { return drawHorizontalHighlightIndicatorEnabled }
     
-    /// - returns: `true` if vertical highlight indicator lines are enabled (drawn)
+    /// `true` if vertical highlight indicator lines are enabled (drawn)
     open var isVerticalHighlightIndicatorEnabled: Bool { return drawVerticalHighlightIndicatorEnabled }
     
     /// Enables / disables both vertical and horizontal highlight-indicators.
@@ -40,9 +40,9 @@ open class LineScatterCandleRadarChartDataSet: BarLineScatterCandleBubbleChartDa
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! LineScatterCandleRadarChartDataSet
+        let copy = super.copy(with: zone) as! LineScatterCandleRadarChartDataSet
         copy.drawHorizontalHighlightIndicatorEnabled = drawHorizontalHighlightIndicatorEnabled
         copy.drawVerticalHighlightIndicatorEnabled = drawVerticalHighlightIndicatorEnabled
         return copy
diff --git a/Source/Charts/Data/Implementations/Standard/PieChartData.swift b/Source/Charts/Data/Implementations/Standard/PieChartData.swift
index 13aadae04e..7f34383517 100644
--- a/Source/Charts/Data/Implementations/Standard/PieChartData.swift
+++ b/Source/Charts/Data/Implementations/Standard/PieChartData.swift
@@ -23,7 +23,21 @@ open class PieChartData: ChartData
         super.init(dataSets: dataSets)
     }
 
-    var dataSet: IPieChartDataSet?
+    /// All DataSet objects this ChartData object holds.
+    @objc open override var dataSets: [IChartDataSet]
+    {
+        get
+        {
+            assert(super.dataSets.count <= 1, "Found multiple data sets while pie chart only allows one")
+            return super.dataSets
+        }
+        set
+        {
+            super.dataSets = newValue
+        }
+    }
+
+    @objc var dataSet: IPieChartDataSet?
     {
         get
         {
@@ -31,9 +45,9 @@ open class PieChartData: ChartData
         }
         set
         {
-            if newValue != nil
+            if let newValue = newValue
             {
-                dataSets = [newValue!]
+                dataSets = [newValue]
             }
             else
             {
@@ -60,7 +74,7 @@ open class PieChartData: ChartData
         
         if ignorecase
         {
-            if (label.caseInsensitiveCompare(dataSets[0].label!) == ComparisonResult.orderedSame)
+            if let label = dataSets[0].label, label.caseInsensitiveCompare(label) == .orderedSame
             {
                 return dataSets[0]
             }
@@ -88,7 +102,7 @@ open class PieChartData: ChartData
     /// Removes the DataSet at the given index in the DataSet array from the data object.
     /// Also recalculates all minimum and maximum values.
     ///
-    /// - returns: `true` if a DataSet was removed, `false` ifno DataSet could be removed.
+    /// - Returns: `true` if a DataSet was removed, `false` ifno DataSet could be removed.
     open override func removeDataSetByIndex(_ index: Int) -> Bool
     {
         if index >= _dataSets.count || index < 0
@@ -99,18 +113,12 @@ open class PieChartData: ChartData
         return false
     }
     
-    /// - returns: The total y-value sum across all DataSet objects the this object represents.
-    open var yValueSum: Double
+    /// The total y-value sum across all DataSet objects the this object represents.
+    @objc open var yValueSum: Double
     {
         guard let dataSet = dataSet else { return 0.0 }
-        
-        var yValueSum: Double = 0.0
-        
-        for i in 0..<dataSet.entryCount
-        {
-            yValueSum += dataSet.entryForIndex(i)?.y ?? 0.0
+        return (0..<dataSet.entryCount).reduce(into: 0) {
+            $0 += dataSet.entryForIndex($1)?.y ?? 0
         }
-        
-        return yValueSum
     }
 }
diff --git a/Source/Charts/Data/Implementations/Standard/PieChartDataEntry.swift b/Source/Charts/Data/Implementations/Standard/PieChartDataEntry.swift
index 9040fc9f46..a01263c333 100644
--- a/Source/Charts/Data/Implementations/Standard/PieChartDataEntry.swift
+++ b/Source/Charts/Data/Implementations/Standard/PieChartDataEntry.swift
@@ -19,98 +19,100 @@ open class PieChartDataEntry: ChartDataEntry
         super.init()
     }
     
-    /// - parameter value: The value on the y-axis
-    /// - parameter label: The label for the x-axis
-    public convenience init(value: Double, label: String?)
+
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    @objc public init(value: Double)
     {
-        self.init(value: value, label: label, icon: nil, data: nil)
+        super.init(x: .nan, y: value)
     }
-    
-    /// - parameter value: The value on the y-axis
-    /// - parameter label: The label for the x-axis
-    /// - parameter data: Spot for additional data this Entry represents
-    public convenience init(value: Double, label: String?, data: AnyObject?)
+
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    ///   - label: The label for the x-axis
+    @objc public convenience init(value: Double, label: String?)
     {
-        self.init(value: value, label: label, icon: nil, data: data)
+        self.init(value: value)
+        self.label = label
     }
     
-    /// - parameter value: The value on the y-axis
-    /// - parameter label: The label for the x-axis
-    /// - parameter icon: icon image
-    public convenience init(value: Double, label: String?, icon: NSUIImage?)
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    ///   - label: The label for the x-axis
+    ///   - data: Spot for additional data this Entry represents
+    @objc public convenience init(value: Double, label: String?, data: Any?)
     {
-        self.init(value: value, label: label, icon: icon, data: nil)
+        self.init(value: value, label: label, icon: nil, data: data)
     }
     
-    /// - parameter value: The value on the y-axis
-    /// - parameter label: The label for the x-axis
-    /// - parameter icon: icon image
-    /// - parameter data: Spot for additional data this Entry represents
-    public init(value: Double, label: String?, icon: NSUIImage?, data: AnyObject?)
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    ///   - label: The label for the x-axis
+    ///   - icon: icon image
+    @objc public convenience init(value: Double, label: String?, icon: NSUIImage?)
     {
-        super.init(x: 0.0, y: value, icon: icon, data: data)
-        
+        self.init(value: value)
         self.label = label
+        self.icon = icon
     }
     
-    /// - parameter value: The value on the y-axis
-    public convenience init(value: Double)
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    ///   - label: The label for the x-axis
+    ///   - icon: icon image
+    ///   - data: Spot for additional data this Entry represents
+    @objc public convenience init(value: Double, label: String?, icon: NSUIImage?, data: Any?)
     {
-        self.init(value: value, label: nil, icon: nil, data: nil)
+        self.init(value: value)
+        self.label = label
+        self.icon = icon
+        self.data = data
     }
-    
-    /// - parameter value: The value on the y-axis
-    /// - parameter data: Spot for additional data this Entry represents
-    public convenience init(value: Double, data: AnyObject?)
+
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    ///   - data: Spot for additional data this Entry represents
+    @objc public convenience init(value: Double, data: Any?)
     {
-        self.init(value: value, label: nil, icon: nil, data: data)
+        self.init(value: value)
+        self.data = data
     }
     
-    /// - parameter value: The value on the y-axis
-    /// - parameter icon: icon image
-    public convenience init(value: Double, icon: NSUIImage?)
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    ///   - icon: icon image
+    @objc public convenience init(value: Double, icon: NSUIImage?)
     {
-        self.init(value: value, label: nil, icon: icon, data: nil)
+        self.init(value: value)
+        self.icon = icon
     }
     
-    /// - parameter value: The value on the y-axis
-    /// - parameter icon: icon image
-    /// - parameter data: Spot for additional data this Entry represents
-    public convenience init(value: Double, icon: NSUIImage?, data: AnyObject?)
+    /// - Parameters:
+    ///   - value: The value on the y-axis
+    ///   - icon: icon image
+    ///   - data: Spot for additional data this Entry represents
+    @objc public convenience init(value: Double, icon: NSUIImage?, data: Any?)
     {
-        self.init(value: value, label: nil, icon: icon, data: data)
+        self.init(value: value)
+        self.icon = icon
+        self.data = data
     }
     
     // MARK: Data property accessors
     
-    open var label: String?
+    @objc open var label: String?
     
-    open var value: Double
+    @objc open var value: Double
     {
         get { return y }
-        set { y = value }
+        set { y = newValue }
     }
-    
-    @available(*, deprecated: 1.0, message: "Pie entries do not have x values")
-    open override var x: Double
-    {
-        get
-        {
-            print("Pie entries do not have x values")
-            return super.x
-        }
-        set
-        {
-            super.x = newValue
-            print("Pie entries do not have x values")
-        }
-    }
-    
+        
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! PieChartDataEntry
+        let copy = super.copy(with: zone) as! PieChartDataEntry
         copy.label = label
         return copy
     }
diff --git a/Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift
index 0a5d9a4029..ac0e63489a 100644
--- a/Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift
@@ -20,34 +20,34 @@ open class PieChartDataSet: ChartDataSet, IPieChartDataSet
         case insideSlice
         case outsideSlice
     }
-    
-    fileprivate func initialize()
+
+    private func initialize()
     {
         self.valueTextColor = NSUIColor.white
         self.valueFont = NSUIFont.systemFont(ofSize: 13.0)
     }
-    
+
     public required init()
     {
         super.init()
         initialize()
     }
-    
-    public override init(values: [ChartDataEntry]?, label: String?)
+
+    public override init(entries: [ChartDataEntry]?, label: String?)
     {
-        super.init(values: values, label: label)
+        super.init(entries: entries, label: label)
         initialize()
     }
-    
+
     internal override func calcMinMax(entry e: ChartDataEntry)
     {
         calcMinMaxY(entry: e)
     }
-    
+
     // MARK: - Styling functions and accessors
-    
-    fileprivate var _sliceSpace = CGFloat(0.0)
-    
+
+    private var _sliceSpace = CGFloat(0.0)
+
     /// the space in pixels between the pie-slices
     /// **default**: 0
     /// **maximum**: 20
@@ -74,44 +74,62 @@ open class PieChartDataSet: ChartDataSet, IPieChartDataSet
 
     /// When enabled, slice spacing will be 0.0 when the smallest value is going to be smaller than the slice spacing itself.
     open var automaticallyDisableSliceSpacing: Bool = false
-    
+
     /// indicates the selection distance of a pie slice
     open var selectionShift = CGFloat(18.0)
-    
+
     open var xValuePosition: ValuePosition = .insideSlice
     open var yValuePosition: ValuePosition = .insideSlice
-    
+
     /// When valuePosition is OutsideSlice, indicates line color
     open var valueLineColor: NSUIColor? = NSUIColor.black
-    
+
+    /// When valuePosition is OutsideSlice and enabled, line will have the same color as the slice
+    open var useValueColorForLine: Bool = false
+
     /// When valuePosition is OutsideSlice, indicates line width
     open var valueLineWidth: CGFloat = 1.0
-    
+
     /// When valuePosition is OutsideSlice, indicates offset as percentage out of the slice size
     open var valueLinePart1OffsetPercentage: CGFloat = 0.75
-    
+
     /// When valuePosition is OutsideSlice, indicates length of first half of the line
     open var valueLinePart1Length: CGFloat = 0.3
-    
+
     /// When valuePosition is OutsideSlice, indicates length of second half of the line
     open var valueLinePart2Length: CGFloat = 0.4
-    
+
     /// When valuePosition is OutsideSlice, this allows variable line length
     open var valueLineVariableLength: Bool = true
-    
+
     /// the font for the slice-text labels
     open var entryLabelFont: NSUIFont? = nil
-    
+
     /// the color for the slice-text labels
     open var entryLabelColor: NSUIColor? = nil
-    
+
+    /// the color for the highlighted sector
+    open var highlightColor: NSUIColor? = nil
+
     // MARK: - NSCopying
-    
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! PieChartDataSet
+        let copy = super.copy(with: zone) as! PieChartDataSet
         copy._sliceSpace = _sliceSpace
+        copy.automaticallyDisableSliceSpacing = automaticallyDisableSliceSpacing
         copy.selectionShift = selectionShift
+        copy.xValuePosition = xValuePosition
+        copy.yValuePosition = yValuePosition
+        copy.valueLineColor = valueLineColor
+        copy.valueLineWidth = valueLineWidth
+        copy.valueLinePart1OffsetPercentage = valueLinePart1OffsetPercentage
+        copy.valueLinePart1Length = valueLinePart1Length
+        copy.valueLinePart2Length = valueLinePart2Length
+        copy.valueLineVariableLength = valueLineVariableLength
+        copy.entryLabelFont = entryLabelFont
+        copy.entryLabelColor = entryLabelColor
+        copy.highlightColor = highlightColor
         return copy
     }
 }
diff --git a/Source/Charts/Data/Implementations/Standard/RadarChartData.swift b/Source/Charts/Data/Implementations/Standard/RadarChartData.swift
index e574567ca9..31fd7d2ba0 100644
--- a/Source/Charts/Data/Implementations/Standard/RadarChartData.swift
+++ b/Source/Charts/Data/Implementations/Standard/RadarChartData.swift
@@ -15,13 +15,13 @@ import CoreGraphics
 
 open class RadarChartData: ChartData
 {
-    open var highlightColor = NSUIColor(red: 255.0/255.0, green: 187.0/255.0, blue: 115.0/255.0, alpha: 1.0)
-    open var highlightLineWidth = CGFloat(1.0)
-    open var highlightLineDashPhase = CGFloat(0.0)
-    open var highlightLineDashLengths: [CGFloat]?
+    @objc open var highlightColor = NSUIColor(red: 255.0/255.0, green: 187.0/255.0, blue: 115.0/255.0, alpha: 1.0)
+    @objc open var highlightLineWidth = CGFloat(1.0)
+    @objc open var highlightLineDashPhase = CGFloat(0.0)
+    @objc open var highlightLineDashLengths: [CGFloat]?
     
     /// Sets labels that should be drawn around the RadarChart at the end of each web line.
-    open var labels = [String]()
+    @objc open var labels = [String]()
     
     /// Sets the labels that should be drawn around the RadarChart at the end of each web line.
     open func setLabels(_ labels: String...)
diff --git a/Source/Charts/Data/Implementations/Standard/RadarChartDataEntry.swift b/Source/Charts/Data/Implementations/Standard/RadarChartDataEntry.swift
index d8d1428b94..576ad24c28 100644
--- a/Source/Charts/Data/Implementations/Standard/RadarChartDataEntry.swift
+++ b/Source/Charts/Data/Implementations/Standard/RadarChartDataEntry.swift
@@ -18,33 +18,36 @@ open class RadarChartDataEntry: ChartDataEntry
     {
         super.init()
     }
-    
-    /// - parameter value: The value on the y-axis.
-    /// - parameter data: Spot for additional data this Entry represents.
-    public init(value: Double, data: AnyObject?)
+
+    /// - Parameters:
+    ///   - value: The value on the y-axis.
+    @objc public init(value: Double)
     {
-        super.init(x: 0.0, y: value, data: data)
+        super.init(x: .nan, y: value)
     }
-    
-    /// - parameter value: The value on the y-axis.
-    public convenience init(value: Double)
+
+    /// - Parameters:
+    ///   - value: The value on the y-axis.
+    ///   - data: Spot for additional data this Entry represents.
+    @objc public convenience init(value: Double, data: Any?)
     {
-        self.init(value: value, data: nil)
+        self.init(value: value)
+        self.data = data
     }
     
     // MARK: Data property accessors
     
-    open var value: Double
+    @objc open var value: Double
     {
         get { return y }
-        set { y = value }
+        set { y = newValue }
     }
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! RadarChartDataEntry
+        let copy = super.copy(with: zone) as! RadarChartDataEntry
         
         return copy
     }
diff --git a/Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift
index fcb3134fba..030269d6a2 100644
--- a/Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift
@@ -15,7 +15,7 @@ import CoreGraphics
 
 open class RadarChartDataSet: LineRadarChartDataSet, IRadarChartDataSet
 {
-    fileprivate func initialize()
+    private func initialize()
     {
         self.valueFont = NSUIFont.systemFont(ofSize: 13.0)
     }
@@ -26,9 +26,9 @@ open class RadarChartDataSet: LineRadarChartDataSet, IRadarChartDataSet
         initialize()
     }
     
-    public required override init(values: [ChartDataEntry]?, label: String?)
+    public required override init(entries: [ChartDataEntry]?, label: String?)
     {
-        super.init(values: values, label: label)
+        super.init(entries: entries, label: label)
         initialize()
     }
     
@@ -40,7 +40,7 @@ open class RadarChartDataSet: LineRadarChartDataSet, IRadarChartDataSet
     /// **default**: false
     open var drawHighlightCircleEnabled: Bool = false
     
-    /// - returns: `true` if highlight circle should be drawn, `false` ifnot
+    /// `true` if highlight circle should be drawn, `false` ifnot
     open var isDrawHighlightCircleEnabled: Bool { return drawHighlightCircleEnabled }
     
     open var highlightCircleFillColor: NSUIColor? = NSUIColor.white
diff --git a/Source/Charts/Data/Implementations/Standard/ScatterChartData.swift b/Source/Charts/Data/Implementations/Standard/ScatterChartData.swift
index 89284f87c9..e06a60325d 100644
--- a/Source/Charts/Data/Implementations/Standard/ScatterChartData.swift
+++ b/Source/Charts/Data/Implementations/Standard/ScatterChartData.swift
@@ -24,30 +24,11 @@ open class ScatterChartData: BarLineScatterCandleBubbleChartData
         super.init(dataSets: dataSets)
     }
     
-    /// - returns: The maximum shape-size across all DataSets.
-    open func getGreatestShapeSize() -> CGFloat
+    /// - Returns: The maximum shape-size across all DataSets.
+    @objc open func getGreatestShapeSize() -> CGFloat
     {
-        var max = CGFloat(0.0)
-        
-        for set in _dataSets
-        {
-            let scatterDataSet = set as? IScatterChartDataSet
-            
-            if scatterDataSet == nil
-            {
-                print("ScatterChartData: Found a DataSet which is not a ScatterChartDataSet", terminator: "\n")
-            }
-            else
-            {
-                let size = scatterDataSet!.scatterShapeSize
-                
-                if size > max
-                {
-                    max = size
-                }
-            }
-        }
-        
-        return max
+        return (_dataSets as? [IScatterChartDataSet])?
+            .max { $0.scatterShapeSize < $1.scatterShapeSize }?
+            .scatterShapeSize ?? 0
     }
 }
diff --git a/Source/Charts/Data/Implementations/Standard/ScatterChartDataSet.swift b/Source/Charts/Data/Implementations/Standard/ScatterChartDataSet.swift
index 2b0a844cd9..bc9767a06c 100644
--- a/Source/Charts/Data/Implementations/Standard/ScatterChartDataSet.swift
+++ b/Source/Charts/Data/Implementations/Standard/ScatterChartDataSet.swift
@@ -40,7 +40,7 @@ open class ScatterChartDataSet: LineScatterCandleRadarChartDataSet, IScatterChar
     
     /// Sets the ScatterShape this DataSet should be drawn with.
     /// This will search for an available IShapeRenderer and set this renderer for the DataSet
-    open func setScatterShape(_ shape: Shape)
+    @objc open func setScatterShape(_ shape: Shape)
     {
         self.shapeRenderer = ScatterChartDataSet.renderer(forShape: shape)
     }
@@ -50,7 +50,7 @@ open class ScatterChartDataSet: LineScatterCandleRadarChartDataSet, IScatterChar
     /// **default**: `SquareShapeRenderer`
     open var shapeRenderer: IShapeRenderer? = SquareShapeRenderer()
     
-    open class func renderer(forShape shape: Shape) -> IShapeRenderer
+    @objc open class func renderer(forShape shape: Shape) -> IShapeRenderer
     {
         switch shape
         {
@@ -66,9 +66,9 @@ open class ScatterChartDataSet: LineScatterCandleRadarChartDataSet, IScatterChar
     
     // MARK: NSCopying
     
-    open override func copyWithZone(_ zone: NSZone?) -> AnyObject
+    open override func copy(with zone: NSZone? = nil) -> Any
     {
-        let copy = super.copyWithZone(zone) as! ScatterChartDataSet
+        let copy = super.copy(with: zone) as! ScatterChartDataSet
         copy.scatterShapeSize = scatterShapeSize
         copy.scatterShapeHoleRadius = scatterShapeHoleRadius
         copy.scatterShapeHoleColor = scatterShapeHoleColor
diff --git a/Source/Charts/Data/Interfaces/IBarChartDataSet.swift b/Source/Charts/Data/Interfaces/IBarChartDataSet.swift
index 6f5cad081c..b90b4dc0c2 100644
--- a/Source/Charts/Data/Interfaces/IBarChartDataSet.swift
+++ b/Source/Charts/Data/Interfaces/IBarChartDataSet.swift
@@ -19,10 +19,10 @@ public protocol IBarChartDataSet: IBarLineScatterCandleBubbleChartDataSet
     
     // MARK: - Styling functions and accessors
     
-    /// - returns: `true` if this DataSet is stacked (stacksize > 1) or not.
+    /// `true` if this DataSet is stacked (stacksize > 1) or not.
     var isStacked: Bool { get }
     
-    /// - returns: The maximum number of bars that can be stacked upon another in this DataSet.
+    /// The maximum number of bars that can be stacked upon another in this DataSet.
     var stackSize: Int { get }
     
     /// the color used for drawing the bar-shadows. The bar shadows is a surface behind the bar that indicates the maximum value
diff --git a/Source/Charts/Data/Interfaces/IChartDataSet.swift b/Source/Charts/Data/Interfaces/IChartDataSet.swift
index 5cdb4bc9ed..849da103b7 100644
--- a/Source/Charts/Data/Interfaces/IChartDataSet.swift
+++ b/Source/Charts/Data/Interfaces/IChartDataSet.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 @objc
 public protocol IChartDataSet
@@ -26,64 +27,66 @@ public protocol IChartDataSet
     /// This is only needed for the autoScaleMinMax feature.
     func calcMinMaxY(fromX: Double, toX: Double)
     
-    /// - returns: The minimum y-value this DataSet holds
+    /// The minimum y-value this DataSet holds
     var yMin: Double { get }
     
-    /// - returns: The maximum y-value this DataSet holds
+    /// The maximum y-value this DataSet holds
     var yMax: Double { get }
     
-    /// - returns: The minimum x-value this DataSet holds
+    /// The minimum x-value this DataSet holds
     var xMin: Double { get }
     
-    /// - returns: The maximum x-value this DataSet holds
+    /// The maximum x-value this DataSet holds
     var xMax: Double { get }
     
-    /// - returns: The number of y-values this DataSet represents
+    /// The number of y-values this DataSet represents
     var entryCount: Int { get }
     
-    /// - returns: The entry object found at the given index (not x-value!)
-    /// - throws: out of bounds
+    /// - Throws: out of bounds
     /// if `i` is out of bounds, it may throw an out-of-bounds exception
+    /// - Returns: The entry object found at the given index (not x-value!)
     func entryForIndex(_ i: Int) -> ChartDataEntry?
     
-    /// - returns: The first Entry object found at the given x-value with binary search.
+    /// - Parameters:
+    ///   - xValue: the x-value
+    ///   - closestToY: If there are multiple y-values for the specified x-value,
+    ///   - rounding: determine whether to round up/down/closest if there is no Entry matching the provided x-value
+    /// - Returns: The first Entry object found at the given x-value with binary search.
     /// If the no Entry at the specified x-value is found, this method returns the Entry at the closest x-value according to the rounding.
     /// nil if no Entry object at that x-value.
-    /// - parameter xValue: the x-value
-    /// - parameter closestToY: If there are multiple y-values for the specified x-value,
-    /// - parameter rounding: determine whether to round up/down/closest if there is no Entry matching the provided x-value
     func entryForXValue(
         _ xValue: Double,
         closestToY yValue: Double,
         rounding: ChartDataSetRounding) -> ChartDataEntry?
     
-    /// - returns: The first Entry object found at the given x-value with binary search.
+    /// - Parameters:
+    ///   - xValue: the x-value
+    ///   - closestToY: If there are multiple y-values for the specified x-value,
+    /// - Returns: The first Entry object found at the given x-value with binary search.
     /// If the no Entry at the specified x-value is found, this method returns the Entry at the closest x-value.
     /// nil if no Entry object at that x-value.
-    /// - parameter xValue: the x-value
-    /// - parameter closestToY: If there are multiple y-values for the specified x-value,
     func entryForXValue(
         _ xValue: Double,
         closestToY yValue: Double) -> ChartDataEntry?
     
-    /// - returns: All Entry objects found at the given x-value with binary search.
+    /// - Returns: All Entry objects found at the given x-value with binary search.
     /// An empty array if no Entry object at that x-value.
     func entriesForXValue(_ xValue: Double) -> [ChartDataEntry]
     
-    /// - returns: The array-index of the specified entry.
+    /// - Parameters:
+    ///   - xValue: x-value of the entry to search for
+    ///   - closestToY: If there are multiple y-values for the specified x-value,
+    ///   - rounding: Rounding method if exact value was not found
+    /// - Returns: The array-index of the specified entry.
     /// If the no Entry at the specified x-value is found, this method returns the index of the Entry at the closest x-value according to the rounding.
-    ///
-    /// - parameter xValue: x-value of the entry to search for
-    /// - parameter closestToY: If there are multiple y-values for the specified x-value,
-    /// - parameter rounding: Rounding method if exact value was not found
     func entryIndex(
         x xValue: Double,
         closestToY yValue: Double,
         rounding: ChartDataSetRounding) -> Int
     
-    /// - returns: The array-index of the specified entry
-    ///
-    /// - parameter e: the entry to search for
+    /// - Parameters:
+    ///   - e: the entry to search for
+    /// - Returns: The array-index of the specified entry
     func entryIndex(entry e: ChartDataEntry) -> Int
     
     /// Adds an Entry to the DataSet dynamically.
@@ -91,8 +94,10 @@ public protocol IChartDataSet
     /// *optional feature, can return `false` ifnot implemented*
     ///
     /// Entries are added to the end of the list.
-    /// - parameter e: the entry to add
-    /// - returns: `true` if the entry was added successfully, `false` ifthis feature is not supported
+    ///
+    /// - Parameters:
+    ///   - e: the entry to add
+    /// - Returns: `true` if the entry was added successfully, `false` ifthis feature is not supported
     func addEntry(_ e: ChartDataEntry) -> Bool
     
     /// Adds an Entry to the DataSet dynamically.
@@ -102,51 +107,56 @@ public protocol IChartDataSet
     /// *optional feature, can return `false` ifnot implemented*
     ///
     /// Entries are added to the end of the list.
-    /// - parameter e: the entry to add
-    /// - returns: `true` if the entry was added successfully, `false` ifthis feature is not supported
+    ///
+    /// - Parameters:
+    ///   - e: the entry to add
+    /// - Returns: `true` if the entry was added successfully, `false` ifthis feature is not supported
     func addEntryOrdered(_ e: ChartDataEntry) -> Bool
     
     /// Removes an Entry from the DataSet dynamically.
     ///
     /// *optional feature, can return `false` ifnot implemented*
     ///
-    /// - parameter entry: the entry to remove
-    /// - returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
+    /// - Parameters:
+    ///   - entry: the entry to remove
+    /// - Returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
     func removeEntry(_ entry: ChartDataEntry) -> Bool
     
     /// Removes the Entry object at the given index in the values array from the DataSet.
     ///
     /// *optional feature, can return `false` ifnot implemented*
     ///
-    /// - parameter index: the index of the entry to remove
-    /// - returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
+    /// - Parameters:
+    ///   - index: the index of the entry to remove
+    /// - Returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
     func removeEntry(index: Int) -> Bool
     
     /// Removes the Entry object closest to the given x-value from the DataSet.
     ///
     /// *optional feature, can return `false` ifnot implemented*
     ///
-    /// - parameter x: the x-value to remove
-    /// - returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
+    /// - Parameters:
+    ///   - x: the x-value to remove
+    /// - Returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
     func removeEntry(x: Double) -> Bool
     
     /// Removes the first Entry (at index 0) of this DataSet from the entries array.
     ///
     /// *optional feature, can return `false` ifnot implemented*
     ///
-    /// - returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
+    /// - Returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
     func removeFirst() -> Bool
     
     /// Removes the last Entry (at index 0) of this DataSet from the entries array.
     ///
     /// *optional feature, can return `false` ifnot implemented*
     ///
-    /// - returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
+    /// - Returns: `true` if the entry was removed successfully, `false` ifthe entry does not exist or if this feature is not supported
     func removeLast() -> Bool
     
     /// Checks if this DataSet contains the specified Entry.
     ///
-    /// - returns: `true` if contains the entry, `false` ifnot.
+    /// - Returns: `true` if contains the entry, `false` ifnot.
     func contains(_ e: ChartDataEntry) -> Bool
     
     /// Removes all values from this DataSet and does all necessary recalculations.
@@ -169,7 +179,7 @@ public protocol IChartDataSet
     /// Colors are reused as soon as the number of Entries the DataSet represents is higher than the size of the colors array.
     var colors: [NSUIColor] { get }
     
-    /// - returns: The color at the given index of the DataSet's color array.
+    /// - Returns: The color at the given index of the DataSet's color array.
     /// This prevents out-of-bounds by performing a modulus on the color index, so colours will repeat themselves.
     func color(atIndex: Int) -> NSUIColor
     
@@ -182,13 +192,13 @@ public protocol IChartDataSet
     /// if true, value highlighting is enabled
     var highlightEnabled: Bool { get set }
     
-    /// - returns: `true` if value highlighting is enabled for this dataset
+    /// `true` if value highlighting is enabled for this dataset
     var isHighlightEnabled: Bool { get }
     
     /// Custom formatter that is used instead of the auto-formatter if set
     var valueFormatter: IValueFormatter? { get set }
     
-    /// - returns: `true` if the valueFormatter object of this DataSet is null.
+    /// `true` if the valueFormatter object of this DataSet is null.
     var needsFormatter: Bool { get }
     
     /// Sets/get a single color for value text.
@@ -196,7 +206,7 @@ public protocol IChartDataSet
     /// Getting will return the first color in the array.
     var valueTextColor: NSUIColor { get set }
     
-    /// - returns: The color at the specified index that is used for drawing the values inside the chart. Uses modulus internally.
+    /// - Returns: The color at the specified index that is used for drawing the values inside the chart. Uses modulus internally.
     func valueTextColorAt(_ index: Int) -> NSUIColor
     
     /// the font for the value-text labels
@@ -231,15 +241,15 @@ public protocol IChartDataSet
     
     /// Set this to true to draw y-values on the chart.
     ///
-    /// - note: For bar and line charts: if `maxVisibleCount` is reached, no values will be drawn even if this is enabled.
+    /// - Note: For bar and line charts: if `maxVisibleCount` is reached, no values will be drawn even if this is enabled.
     var drawValuesEnabled: Bool { get set }
     
-    /// - returns: `true` if y-value drawing is enabled, `false` ifnot
+    /// `true` if y-value drawing is enabled, `false` ifnot
     var isDrawValuesEnabled: Bool { get }
     
     /// Set this to true to draw y-icons on the chart
     ///
-    /// - note: For bar and line charts: if `maxVisibleCount` is reached, no icons will be drawn even if this is enabled.
+    /// - Note: For bar and line charts: if `maxVisibleCount` is reached, no icons will be drawn even if this is enabled.
     var drawIconsEnabled: Bool { get set }
     
     /// Returns true if y-icon drawing is enabled, false if not
@@ -255,6 +265,6 @@ public protocol IChartDataSet
     /// Set the visibility of this DataSet. If not visible, the DataSet will not be drawn to the chart upon refreshing it.
     var visible: Bool { get set }
     
-    /// - returns: `true` if this DataSet is visible inside the chart, or `false` ifit is currently hidden.
+    /// `true` if this DataSet is visible inside the chart, or `false` ifit is currently hidden.
     var isVisible: Bool { get }
 }
diff --git a/Source/Charts/Data/Interfaces/ILineChartDataSet.swift b/Source/Charts/Data/Interfaces/ILineChartDataSet.swift
index 95ee5258f7..de3ab9522a 100755
--- a/Source/Charts/Data/Interfaces/ILineChartDataSet.swift
+++ b/Source/Charts/Data/Interfaces/ILineChartDataSet.swift
@@ -30,18 +30,6 @@ public protocol ILineChartDataSet: ILineRadarChartDataSet
     /// **default**: 0.2
     var cubicIntensity: CGFloat { get set }
     
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    var drawCubicEnabled: Bool { get set }
-    
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    var isDrawCubicEnabled: Bool { get }
-    
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    var drawSteppedEnabled: Bool { get set }
-    
-    @available(*, deprecated: 1.0, message: "Use `mode` instead.")
-    var isDrawSteppedEnabled: Bool { get }
-
     /// The radius of the drawn circles.
     var circleRadius: CGFloat { get set }
     
@@ -50,7 +38,7 @@ public protocol ILineChartDataSet: ILineRadarChartDataSet
     
     var circleColors: [NSUIColor] { get set }
     
-    /// - returns: The color at the given index of the DataSet's circle-color array.
+    /// - Returns: The color at the given index of the DataSet's circle-color array.
     /// Performs a IndexOutOfBounds check by modulus.
     func getCircleColor(atIndex: Int) -> NSUIColor?
     
@@ -64,7 +52,7 @@ public protocol ILineChartDataSet: ILineRadarChartDataSet
     /// If true, drawing circles is enabled
     var drawCirclesEnabled: Bool { get set }
     
-    /// - returns: `true` if drawing circles for this DataSet is enabled, `false` ifnot
+    /// `true` if drawing circles for this DataSet is enabled, `false` ifnot
     var isDrawCirclesEnabled: Bool { get }
     
     /// The color of the inner circle (the circle-hole).
@@ -73,7 +61,7 @@ public protocol ILineChartDataSet: ILineRadarChartDataSet
     /// `true` if drawing circles for this DataSet is enabled, `false` ifnot
     var drawCircleHoleEnabled: Bool { get set }
     
-    /// - returns: `true` if drawing the circle-holes is enabled, `false` ifnot.
+    /// `true` if drawing the circle-holes is enabled, `false` ifnot.
     var isDrawCircleHoleEnabled: Bool { get }
     
     /// This is how much (in pixels) into the dash pattern are we starting from.
diff --git a/Source/Charts/Data/Interfaces/ILineRadarChartDataSet.swift b/Source/Charts/Data/Interfaces/ILineRadarChartDataSet.swift
index 5d054948af..d9f8980b47 100644
--- a/Source/Charts/Data/Interfaces/ILineRadarChartDataSet.swift
+++ b/Source/Charts/Data/Interfaces/ILineRadarChartDataSet.swift
@@ -22,7 +22,7 @@ public protocol ILineRadarChartDataSet: ILineScatterCandleRadarChartDataSet
     /// The color that is used for filling the line surface area.
     var fillColor: NSUIColor { get set }
 
-    /// - returns: The object that is used for filling the area below the line.
+    /// - Returns: The object that is used for filling the area below the line.
     /// **default**: nil
     var fill: Fill? { get set }
     
@@ -40,6 +40,6 @@ public protocol ILineRadarChartDataSet: ILineScatterCandleRadarChartDataSet
     /// Please note that this method uses the path clipping for drawing the filled area (with images, gradients and layers).
     var drawFilledEnabled: Bool { get set }
     
-    /// - returns: `true` if filled drawing is enabled, `false` ifnot
+    /// `true` if filled drawing is enabled, `false` if not
     var isDrawFilledEnabled: Bool { get }
 }
diff --git a/Source/Charts/Data/Interfaces/ILineScatterCandleRadarChartDataSet.swift b/Source/Charts/Data/Interfaces/ILineScatterCandleRadarChartDataSet.swift
index cf646a1b56..27c2bca944 100644
--- a/Source/Charts/Data/Interfaces/ILineScatterCandleRadarChartDataSet.swift
+++ b/Source/Charts/Data/Interfaces/ILineScatterCandleRadarChartDataSet.swift
@@ -24,10 +24,10 @@ public protocol ILineScatterCandleRadarChartDataSet: IBarLineScatterCandleBubble
     /// Enables / disables the vertical highlight-indicator. If disabled, the indicator is not drawn.
     var drawVerticalHighlightIndicatorEnabled: Bool { get set }
     
-    /// - returns: `true` if horizontal highlight indicator lines are enabled (drawn)
+    /// `true` if horizontal highlight indicator lines are enabled (drawn)
     var isHorizontalHighlightIndicatorEnabled: Bool { get }
     
-    /// - returns: `true` if vertical highlight indicator lines are enabled (drawn)
+    /// `true` if vertical highlight indicator lines are enabled (drawn)
     var isVerticalHighlightIndicatorEnabled: Bool { get }
     
     /// Enables / disables both vertical and horizontal highlight-indicators.
diff --git a/Source/Charts/Data/Interfaces/IPieChartDataSet.swift b/Source/Charts/Data/Interfaces/IPieChartDataSet.swift
index 51e7baa488..433c08f262 100644
--- a/Source/Charts/Data/Interfaces/IPieChartDataSet.swift
+++ b/Source/Charts/Data/Interfaces/IPieChartDataSet.swift
@@ -12,50 +12,53 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 @objc
 public protocol IPieChartDataSet: IChartDataSet
 {
     // MARK: - Styling functions and accessors
-    
+
     /// the space in pixels between the pie-slices
     /// **default**: 0
     /// **maximum**: 20
     var sliceSpace: CGFloat { get set }
-    
+
     /// When enabled, slice spacing will be 0.0 when the smallest value is going to be smaller than the slice spacing itself.
     var automaticallyDisableSliceSpacing: Bool { get set }
-    
+
     /// indicates the selection distance of a pie slice
     var selectionShift: CGFloat { get set }
-    
+
     var xValuePosition: PieChartDataSet.ValuePosition { get set }
     var yValuePosition: PieChartDataSet.ValuePosition { get set }
-    
+
     /// When valuePosition is OutsideSlice, indicates line color
     var valueLineColor: NSUIColor? { get set }
-    
+
+    /// When valuePosition is OutsideSlice and enabled, line will have the same color as the slice
+    var useValueColorForLine: Bool { get set }
+
     /// When valuePosition is OutsideSlice, indicates line width
     var valueLineWidth: CGFloat { get set }
-    
+
     /// When valuePosition is OutsideSlice, indicates offset as percentage out of the slice size
     var valueLinePart1OffsetPercentage: CGFloat { get set }
-    
+
     /// When valuePosition is OutsideSlice, indicates length of first half of the line
     var valueLinePart1Length: CGFloat { get set }
-    
+
     /// When valuePosition is OutsideSlice, indicates length of second half of the line
     var valueLinePart2Length: CGFloat { get set }
-    
+
     /// When valuePosition is OutsideSlice, this allows variable line length
     var valueLineVariableLength: Bool { get set }
-    
+
     /// the font for the slice-text labels
     var entryLabelFont: NSUIFont? { get set }
-    
+
     /// the color for the slice-text labels
     var entryLabelColor: NSUIColor? { get set }
+
+    /// get/sets the color for the highlighted sector
+    var highlightColor: NSUIColor? { get set }
+
 }
diff --git a/Source/Charts/Data/Interfaces/IScatterChartDataSet.swift b/Source/Charts/Data/Interfaces/IScatterChartDataSet.swift
index 5703f07d00..0565146725 100644
--- a/Source/Charts/Data/Interfaces/IScatterChartDataSet.swift
+++ b/Source/Charts/Data/Interfaces/IScatterChartDataSet.swift
@@ -19,18 +19,18 @@ public protocol IScatterChartDataSet: ILineScatterCandleRadarChartDataSet
     
     // MARK: - Styling functions and accessors
     
-    /// - returns: The size the scatter shape will have
+    /// The size the scatter shape will have
     var scatterShapeSize: CGFloat { get }
     
-    /// - returns: The radius of the hole in the shape (applies to Square, Circle and Triangle)
+    /// - Returns: The radius of the hole in the shape (applies to Square, Circle and Triangle)
     /// Set this to <= 0 to remove holes.
     /// **default**: 0.0
     var scatterShapeHoleRadius: CGFloat { get }
     
-    /// - returns: Color for the hole in the shape. Setting to `nil` will behave as transparent.
+    /// - Returns: Color for the hole in the shape. Setting to `nil` will behave as transparent.
     /// **default**: nil
     var scatterShapeHoleColor: NSUIColor? { get }
     
-    /// - returns: The IShapeRenderer responsible for rendering this DataSet.
+    /// The IShapeRenderer responsible for rendering this DataSet.
     var shapeRenderer: IShapeRenderer? { get }
 }
diff --git a/Source/Charts/Filters/DataApproximator+N.swift b/Source/Charts/Filters/DataApproximator+N.swift
new file mode 100644
index 0000000000..b194955003
--- /dev/null
+++ b/Source/Charts/Filters/DataApproximator+N.swift
@@ -0,0 +1,153 @@
+//
+//  DataApproximator+N.swift
+//  Charts
+//
+//  Created by M Ivaniushchenko on 9/6/17.
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+import Foundation
+import CoreGraphics
+
+extension CGPoint {
+    fileprivate func distanceToLine(from linePoint1: CGPoint, to linePoint2: CGPoint) -> CGFloat {
+        let dx = linePoint2.x - linePoint1.x
+        let dy = linePoint2.y - linePoint1.y
+        
+        let dividend = abs(dy * self.x - dx * self.y - linePoint1.x * linePoint2.y + linePoint2.x * linePoint1.y)
+        let divisor = sqrt(dx * dx + dy * dy)
+        
+        return dividend / divisor
+    }
+}
+
+private struct LineAlt {
+    let start: Int
+    let end: Int
+    
+    var distance: CGFloat = 0
+    var index: Int = 0
+    
+    init(start: Int, end: Int, points: [CGPoint]) {
+        self.start = start
+        self.end = end
+        
+        let startPoint = points[start]
+        let endPoint = points[end]
+        
+        guard (end > start + 1) else {
+            return
+        }
+        
+        for i in start + 1 ..< end {
+            let currentPoint = points[i]
+            
+            let distance = currentPoint.distanceToLine(from: startPoint, to: endPoint)
+            
+            if distance > self.distance {
+                self.index = i
+                self.distance = distance
+            }
+        }
+    }
+}
+
+extension LineAlt: Comparable {
+    static func ==(lhs: LineAlt, rhs: LineAlt) -> Bool {
+        return (lhs.start == rhs.start) && (lhs.end == rhs.end) && (lhs.index == rhs.index)
+    }
+    
+    static func <(lhs: LineAlt, rhs: LineAlt) -> Bool {
+        return lhs.distance < rhs.distance
+    }
+}
+
+
+extension DataApproximator {
+    /// uses the douglas peuker algorithm to reduce the given arraylist of entries to given number of points
+    /// More algorithm details here - http://psimpl.sourceforge.net/douglas-peucker.html
+    @objc open class func reduceWithDouglasPeukerN(_ points: [CGPoint], resultCount: Int) -> [CGPoint]
+    {
+        // if a shape has 2 or less points it cannot be reduced
+        if resultCount <= 2 || resultCount >= points.count
+        {
+            return points
+        }
+        var keep = [Bool](repeating: false, count: points.count)
+        
+        // first and last always stay
+        keep[0] = true
+        keep[points.count - 1] = true
+        var currentStoredPoints = 2
+        
+        var queue = [LineAlt]()
+        let line = LineAlt(start: 0, end: points.count - 1, points: points)
+        queue.append(line)
+        
+        repeat {
+            let line = queue.popLast()!
+            
+            // store the key
+            keep[line.index] = true
+            
+            // check point count tolerance
+            currentStoredPoints += 1
+            
+            if (currentStoredPoints == resultCount) {
+                break;
+            }
+            
+            // split the polyline at the key and recurse
+            let left = LineAlt(start: line.start, end: line.index, points: points)
+            if (left.index > 0) {
+                self.insertLine(left, into: &queue)
+            }
+            
+            let right = LineAlt(start: line.index, end: line.end, points: points)
+            if (right.index > 0) {
+                self.insertLine(right, into: &queue)
+            }
+            
+        } while !queue.isEmpty
+        
+        // create a new array with series, only take the kept ones
+        let reducedEntries = points.enumerated().compactMap { (index: Int, point: CGPoint) -> CGPoint? in
+            return keep[index] ? point : nil
+        }
+        
+        return reducedEntries
+    }
+    
+    // Keeps array sorted
+    private static func insertLine(_ line: LineAlt, into array: inout [LineAlt]) {
+        let insertionIndex = self.insertionIndex(for: line, into: &array)
+        array.insert(line, at: insertionIndex)
+    }
+    
+    private static func insertionIndex(for line: LineAlt, into array: inout [LineAlt]) -> Int {
+        var indices = array.indices
+        
+        while !indices.isEmpty {
+            let midIndex = indices.lowerBound.advanced(by: indices.count / 2)
+            let midLine = array[midIndex]
+            
+            if midLine == line {
+                return midIndex
+            }
+            else if (line < midLine) {
+                // perform search in left half
+                indices = indices.lowerBound..<midIndex
+            }
+            else {
+                // perform search in right half
+                indices = (midIndex + 1)..<indices.upperBound
+            }
+        }
+        
+        return indices.lowerBound
+    }
+}
+
+
diff --git a/Source/Charts/Filters/DataApproximator.swift b/Source/Charts/Filters/DataApproximator.swift
index 608714a0a6..234a7d11e2 100644
--- a/Source/Charts/Filters/DataApproximator.swift
+++ b/Source/Charts/Filters/DataApproximator.swift
@@ -10,12 +10,13 @@
 //
 
 import Foundation
+import CoreGraphics
 
 @objc(ChartDataApproximator)
 open class DataApproximator: NSObject
 {
     /// uses the douglas peuker algorithm to reduce the given arraylist of entries
-    open class func reduceWithDouglasPeuker(_ points: [CGPoint], tolerance: CGFloat) -> [CGPoint]
+    @objc open class func reduceWithDouglasPeuker(_ points: [CGPoint], tolerance: CGFloat) -> [CGPoint]
     {
         // if a shape has 2 or less points it cannot be reduced
         if tolerance <= 0 || points.count < 3
@@ -37,24 +38,16 @@ open class DataApproximator: NSObject
                                 keep: &keep)
         
         // create a new array with series, only take the kept ones
-        var reducedEntries = [CGPoint]()
-        for i in 0 ..< points.count
-        {
-            if keep[i]
-            {
-                reducedEntries.append(points[i])
-            }
-        }
-        
-        return reducedEntries
+        return zip(keep, points).compactMap { $0 ? nil : $1 }
     }
 
     /// apply the Douglas-Peucker-Reduction to an array of `CGPoint`s with a given tolerance
     ///
-    /// - parameter points:
-    /// - parameter tolerance:
-    /// - parameter start:
-    /// - parameter end:
+    /// - Parameters:
+    ///   - points:
+    ///   - tolerance:
+    ///   - start:
+    ///   - end:
     open class func reduceWithDouglasPeuker(
         points: [CGPoint],
         tolerance: CGFloat,
@@ -95,7 +88,7 @@ open class DataApproximator: NSObject
         } // else don't keep the point...
     }
     
-    fileprivate class Line
+    private class Line
     {
         var sxey: CGFloat
         var exsy: CGFloat
diff --git a/Source/Charts/Formatters/DefaultAxisValueFormatter.swift b/Source/Charts/Formatters/DefaultAxisValueFormatter.swift
index fdc5ddc432..85193d0c46 100644
--- a/Source/Charts/Formatters/DefaultAxisValueFormatter.swift
+++ b/Source/Charts/Formatters/DefaultAxisValueFormatter.swift
@@ -18,12 +18,12 @@ open class DefaultAxisValueFormatter: NSObject, IAxisValueFormatter
         _ value: Double,
         _ axis: AxisBase?) -> String
     
-    open var block: Block?
+    @objc open var block: Block?
     
-    open var hasAutoDecimals: Bool = false
+    @objc open var hasAutoDecimals: Bool = false
     
-    fileprivate var _formatter: NumberFormatter?
-    open var formatter: NumberFormatter?
+    private var _formatter: NumberFormatter?
+    @objc open var formatter: NumberFormatter?
     {
         get { return _formatter }
         set
@@ -32,8 +32,9 @@ open class DefaultAxisValueFormatter: NSObject, IAxisValueFormatter
             _formatter = newValue
         }
     }
-    
-    fileprivate var _decimals: Int?
+
+    // TODO: Documentation. Especially the nil case
+    private var _decimals: Int?
     open var decimals: Int?
     {
         get { return _decimals }
@@ -58,14 +59,14 @@ open class DefaultAxisValueFormatter: NSObject, IAxisValueFormatter
         hasAutoDecimals = true
     }
     
-    public init(formatter: NumberFormatter)
+    @objc public init(formatter: NumberFormatter)
     {
         super.init()
         
         self.formatter = formatter
     }
     
-    public init(decimals: Int)
+    @objc public init(decimals: Int)
     {
         super.init()
         
@@ -75,14 +76,14 @@ open class DefaultAxisValueFormatter: NSObject, IAxisValueFormatter
         hasAutoDecimals = true
     }
     
-    public init(block: @escaping Block)
+    @objc public init(block: @escaping Block)
     {
         super.init()
         
         self.block = block
     }
     
-    public static func with(block: @escaping Block) -> DefaultAxisValueFormatter?
+    @objc public static func with(block: @escaping Block) -> DefaultAxisValueFormatter?
     {
         return DefaultAxisValueFormatter(block: block)
     }
@@ -90,14 +91,10 @@ open class DefaultAxisValueFormatter: NSObject, IAxisValueFormatter
     open func stringForValue(_ value: Double,
                                axis: AxisBase?) -> String
     {
-        if block != nil
-        {
-            return block!(value, axis)
-        }
-        else
-        {
+        if let block = block {
+            return block(value, axis)
+        } else {
             return formatter?.string(from: NSNumber(floatLiteral: value)) ?? ""
         }
     }
-    
 }
diff --git a/Source/Charts/Formatters/DefaultFillFormatter.swift b/Source/Charts/Formatters/DefaultFillFormatter.swift
index b986a841da..3afadf35fa 100644
--- a/Source/Charts/Formatters/DefaultFillFormatter.swift
+++ b/Source/Charts/Formatters/DefaultFillFormatter.swift
@@ -12,10 +12,6 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 /// Default formatter that calculates the position of the filled line.
 @objc(ChartDefaultFillFormatter)
 open class DefaultFillFormatter: NSObject, IFillFormatter
@@ -24,19 +20,16 @@ open class DefaultFillFormatter: NSObject, IFillFormatter
         _ dataSet: ILineChartDataSet,
         _ dataProvider: LineChartDataProvider) -> CGFloat
     
-    open var block: Block?
+    @objc open var block: Block?
     
-    public override init()
-    {
-        
-    }
+    public override init() { }
     
-    public init(block: @escaping Block)
+    @objc public init(block: @escaping Block)
     {
         self.block = block
     }
     
-    public static func with(block: @escaping Block) -> DefaultFillFormatter?
+    @objc public static func with(block: @escaping Block) -> DefaultFillFormatter?
     {
         return DefaultFillFormatter(block: block)
     }
@@ -45,47 +38,21 @@ open class DefaultFillFormatter: NSObject, IFillFormatter
         dataSet: ILineChartDataSet,
         dataProvider: LineChartDataProvider) -> CGFloat
     {
-        if block != nil
+        guard block == nil else { return block!(dataSet, dataProvider) }
+        var fillMin: CGFloat = 0.0
+
+        if dataSet.yMax > 0.0 && dataSet.yMin < 0.0
         {
-            return block!(dataSet, dataProvider)
+            fillMin = 0.0
         }
-        else
+        else if let data = dataProvider.data
         {
-            var fillMin = CGFloat(0.0)
-            
-            if dataSet.yMax > 0.0 && dataSet.yMin < 0.0
-            {
-                fillMin = 0.0
-            }
-            else
-            {
-                if let data = dataProvider.data
-                {
-                    var max: Double, min: Double
-                    
-                    if data.yMax > 0.0
-                    {
-                        max = 0.0
-                    }
-                    else
-                    {
-                        max = dataProvider.chartYMax
-                    }
-                    
-                    if data.yMin < 0.0
-                    {
-                        min = 0.0
-                    }
-                    else
-                    {
-                        min = dataProvider.chartYMin
-                    }
-                    
-                    fillMin = CGFloat(dataSet.yMin >= 0.0 ? min : max)
-                }
-            }
-            
-            return fillMin
+            let max = data.yMax > 0.0 ? 0.0 : dataProvider.chartYMax
+            let min = data.yMin < 0.0 ? 0.0 : dataProvider.chartYMin
+
+            fillMin = CGFloat(dataSet.yMin >= 0.0 ? min : max)
         }
+
+        return fillMin
     }
 }
diff --git a/Source/Charts/Formatters/DefaultValueFormatter.swift b/Source/Charts/Formatters/DefaultValueFormatter.swift
index 44dcfc733d..b3fff70ac9 100644
--- a/Source/Charts/Formatters/DefaultValueFormatter.swift
+++ b/Source/Charts/Formatters/DefaultValueFormatter.swift
@@ -20,12 +20,12 @@ open class DefaultValueFormatter: NSObject, IValueFormatter
         _ dataSetIndex: Int,
         _ viewPortHandler: ViewPortHandler?) -> String
     
-    open var block: Block?
+    @objc open var block: Block?
     
-    open var hasAutoDecimals: Bool = false
+    @objc open var hasAutoDecimals: Bool = false
     
-    fileprivate var _formatter: NumberFormatter?
-    open var formatter: NumberFormatter?
+    private var _formatter: NumberFormatter?
+    @objc open var formatter: NumberFormatter?
     {
         get { return _formatter }
         set
@@ -35,7 +35,7 @@ open class DefaultValueFormatter: NSObject, IValueFormatter
         }
     }
     
-    fileprivate var _decimals: Int?
+    private var _decimals: Int?
     open var decimals: Int?
     {
         get { return _decimals }
@@ -60,14 +60,14 @@ open class DefaultValueFormatter: NSObject, IValueFormatter
         hasAutoDecimals = true
     }
     
-    public init(formatter: NumberFormatter)
+    @objc public init(formatter: NumberFormatter)
     {
         super.init()
         
         self.formatter = formatter
     }
     
-    public init(decimals: Int)
+    @objc public init(decimals: Int)
     {
         super.init()
         
@@ -77,14 +77,14 @@ open class DefaultValueFormatter: NSObject, IValueFormatter
         hasAutoDecimals = true
     }
     
-    public init(block: @escaping Block)
+    @objc public init(block: @escaping Block)
     {
         super.init()
         
         self.block = block
     }
     
-    public static func with(block: @escaping Block) -> DefaultValueFormatter?
+    @objc public static func with(block: @escaping Block) -> DefaultValueFormatter?
     {
         return DefaultValueFormatter(block: block)
     }
@@ -94,14 +94,10 @@ open class DefaultValueFormatter: NSObject, IValueFormatter
                              dataSetIndex: Int,
                              viewPortHandler: ViewPortHandler?) -> String
     {
-        if block != nil
-        {
-            return block!(value, entry, dataSetIndex, viewPortHandler)
-        }
-        else
-        {
+        if let block = block {
+            return block(value, entry, dataSetIndex, viewPortHandler)
+        } else {
             return formatter?.string(from: NSNumber(floatLiteral: value)) ?? ""
         }
     }
-    
 }
diff --git a/Source/Charts/Formatters/IAxisValueFormatter.swift b/Source/Charts/Formatters/IAxisValueFormatter.swift
index 3d912070e6..08f42b51f1 100755
--- a/Source/Charts/Formatters/IAxisValueFormatter.swift
+++ b/Source/Charts/Formatters/IAxisValueFormatter.swift
@@ -13,17 +13,17 @@ import Foundation
 
 /// An interface for providing custom axis Strings.
 @objc(IChartAxisValueFormatter)
-public protocol IAxisValueFormatter : NSObjectProtocol
+public protocol IAxisValueFormatter: class
 {
     
     /// Called when a value from an axis is formatted before being drawn.
     ///
     /// For performance reasons, avoid excessive calculations and memory allocations inside this method.
     ///
-    /// - returns: The customized label that is drawn on the x-axis.
-    /// - parameter value:           the value that is currently being drawn
-    /// - parameter axis:            the axis that the value belongs to
-    ///
+    /// - Parameters:
+    ///   - value:           the value that is currently being drawn
+    ///   - axis:            the axis that the value belongs to
+    /// - Returns: The customized label that is drawn on the x-axis.
     func stringForValue(_ value: Double,
                         axis: AxisBase?) -> String
     
diff --git a/Source/Charts/Formatters/IFillFormatter.swift b/Source/Charts/Formatters/IFillFormatter.swift
index 8a88500299..7b684fd84e 100644
--- a/Source/Charts/Formatters/IFillFormatter.swift
+++ b/Source/Charts/Formatters/IFillFormatter.swift
@@ -16,6 +16,6 @@ import CoreGraphics
 @objc(IChartFillFormatter)
 public protocol IFillFormatter
 {
-    /// - returns: The vertical (y-axis) position where the filled-line of the LineDataSet should end.
+    /// - Returns: The vertical (y-axis) position where the filled-line of the LineDataSet should end.
     func getFillLinePosition(dataSet: ILineChartDataSet, dataProvider: LineChartDataProvider) -> CGFloat
 }
diff --git a/Source/Charts/Formatters/IValueFormatter.swift b/Source/Charts/Formatters/IValueFormatter.swift
index 4d06ef6369..53ca7a40c2 100644
--- a/Source/Charts/Formatters/IValueFormatter.swift
+++ b/Source/Charts/Formatters/IValueFormatter.swift
@@ -11,29 +11,24 @@
 
 import Foundation
 
-/// Interface that allows custom formatting of all values inside the chart before they are being drawn to the screen.
+/// Interface that allows custom formatting of all values inside the chart before they are drawn to the screen.
 ///
-/// Simply create your own formatting class and let it implement ValueFormatter.
-///
-/// Then override the getFormattedValue(...) method and return whatever you want.
+/// Simply create your own formatting class and let it implement ValueFormatter. Then override the stringForValue()
+/// method and return whatever you want.
+
 @objc(IChartValueFormatter)
-public protocol IValueFormatter : NSObjectProtocol
+public protocol IValueFormatter: class
 {
     
     /// Called when a value (from labels inside the chart) is formatted before being drawn.
     ///
     /// For performance reasons, avoid excessive calculations and memory allocations inside this method.
     ///
-    /// - returns: The formatted label ready for being drawn
-    ///
-    /// - parameter value:           The value to be formatted
-    ///
-    /// - parameter axis:            The entry the value belongs to - in e.g. BarChart, this is of class BarEntry
-    ///
-    /// - parameter dataSetIndex:    The index of the DataSet the entry in focus belongs to
-    ///
-    /// - parameter viewPortHandler: provides information about the current chart state (scale, translation, ...)
-    ///
+    /// - Parameters:
+    ///   - value:           The value to be formatted
+    ///   - dataSetIndex:    The index of the DataSet the entry in focus belongs to
+    ///   - viewPortHandler: provides information about the current chart state (scale, translation, ...)
+    /// - Returns:                   The formatted label ready to be drawn
     func stringForValue(_ value: Double,
                         entry: ChartDataEntry,
                         dataSetIndex: Int,
diff --git a/Source/Charts/Formatters/IndexAxisValueFormatter.swift b/Source/Charts/Formatters/IndexAxisValueFormatter.swift
index 6b259544e6..a1989fab0b 100755
--- a/Source/Charts/Formatters/IndexAxisValueFormatter.swift
+++ b/Source/Charts/Formatters/IndexAxisValueFormatter.swift
@@ -18,7 +18,7 @@ open class IndexAxisValueFormatter: NSObject, IAxisValueFormatter
     private var _values: [String] = [String]()
     private var _valueCount: Int = 0
     
-    public var values: [String]
+    @objc public var values: [String]
     {
         get
         {
@@ -37,14 +37,14 @@ open class IndexAxisValueFormatter: NSObject, IAxisValueFormatter
         
     }
     
-    public init(values: [String])
+    @objc public init(values: [String])
     {
         super.init()
         
         self.values = values
     }
     
-    public static func with(values: [String]) -> IndexAxisValueFormatter?
+    @objc public static func with(values: [String]) -> IndexAxisValueFormatter?
     {
         return IndexAxisValueFormatter(values: values)
     }
@@ -53,12 +53,7 @@ open class IndexAxisValueFormatter: NSObject, IAxisValueFormatter
                              axis: AxisBase?) -> String
     {
         let index = Int(value.rounded())
-        
-        if index < 0 || index >= _valueCount || index != Int(value)
-        {
-            return ""
-        }
-        
+        guard values.indices.contains(index), index == Int(value) else { return "" }
         return _values[index]
     }
     
diff --git a/Source/Charts/Highlight/BarHighlighter.swift b/Source/Charts/Highlight/BarHighlighter.swift
index 4c3e8498cd..da9e6da733 100644
--- a/Source/Charts/Highlight/BarHighlighter.swift
+++ b/Source/Charts/Highlight/BarHighlighter.swift
@@ -17,30 +17,25 @@ open class BarHighlighter: ChartHighlighter
 {
     open override func getHighlight(x: CGFloat, y: CGFloat) -> Highlight?
     {
-        let high = super.getHighlight(x: x, y: y)
+        guard
+            let barData = (self.chart as? BarChartDataProvider)?.barData,
+            let high = super.getHighlight(x: x, y: y)
+            else { return nil }
         
-        if high == nil
+        let pos = getValsForTouch(x: x, y: y)
+
+        if let set = barData.getDataSetByIndex(high.dataSetIndex) as? IBarChartDataSet,
+            set.isStacked
         {
-            return nil
+            return getStackedHighlight(high: high,
+                                       set: set,
+                                       xValue: Double(pos.x),
+                                       yValue: Double(pos.y))
         }
-        
-        if let barData = (self.chart as? BarChartDataProvider)?.barData
+        else
         {
-            let pos = getValsForTouch(x: x, y: y)
-            
-            if
-                let set = barData.getDataSetByIndex(high!.dataSetIndex) as? IBarChartDataSet,
-                set.isStacked
-            {
-                return getStackedHighlight(high: high!,
-                                           set: set,
-                                           xValue: Double(pos.x),
-                                           yValue: Double(pos.y))
-            }
-            
             return high
         }
-        return nil
     }
     
     internal override func getDistance(x1: CGFloat, y1: CGFloat, x2: CGFloat, y2: CGFloat) -> CGFloat
@@ -54,12 +49,14 @@ open class BarHighlighter: ChartHighlighter
     }
     
     /// This method creates the Highlight object that also indicates which value of a stacked BarEntry has been selected.
-    /// - parameter high: the Highlight to work with looking for stacked values
-    /// - parameter set:
-    /// - parameter xIndex:
-    /// - parameter yValue:
-    /// - returns:
-    open func getStackedHighlight(high: Highlight,
+    ///
+    /// - Parameters:
+    ///   - high: the Highlight to work with looking for stacked values
+    ///   - set:
+    ///   - xIndex:
+    ///   - yValue:
+    /// - Returns:
+    @objc open func getStackedHighlight(high: Highlight,
                                   set: IBarChartDataSet,
                                   xValue: Double,
                                   yValue: Double) -> Highlight?
@@ -75,54 +72,37 @@ open class BarHighlighter: ChartHighlighter
             return high
         }
         
-        if let ranges = entry.ranges,
+        guard
+            let ranges = entry.ranges,
             ranges.count > 0
-        {
-            let stackIndex = getClosestStackIndex(ranges: ranges, value: yValue)
-            
-            let pixel = chart
-                .getTransformer(forAxis: set.axisDependency)
-                .pixelForValues(x: high.x, y: ranges[stackIndex].to)
-            
-            return Highlight(x: entry.x,
-                             y: entry.y,
-                             xPx: pixel.x,
-                             yPx: pixel.y,
-                             dataSetIndex: high.dataSetIndex,
-                             stackIndex: stackIndex,
-                             axis: high.axis)
-        }
-        
-        return nil
+            else { return nil }
+
+        let stackIndex = getClosestStackIndex(ranges: ranges, value: yValue)
+        let pixel = chart
+            .getTransformer(forAxis: set.axisDependency)
+            .pixelForValues(x: high.x, y: ranges[stackIndex].to)
+
+        return Highlight(x: entry.x,
+                         y: entry.y,
+                         xPx: pixel.x,
+                         yPx: pixel.y,
+                         dataSetIndex: high.dataSetIndex,
+                         stackIndex: stackIndex,
+                         axis: high.axis)
     }
     
-    /// - returns: The index of the closest value inside the values array / ranges (stacked barchart) to the value given as a parameter.
-    /// - parameter entry:
-    /// - parameter value:
-    /// - returns:
-    open func getClosestStackIndex(ranges: [Range]?, value: Double) -> Int
+    /// - Parameters:
+    ///   - entry:
+    ///   - value:
+    /// - Returns: The index of the closest value inside the values array / ranges (stacked barchart) to the value given as a parameter.
+    @objc open func getClosestStackIndex(ranges: [Range]?, value: Double) -> Int
     {
-        if ranges == nil
-        {
-            return 0
+        guard let ranges = ranges else { return 0 }
+        if let stackIndex = ranges.firstIndex(where: { $0.contains(value) }) {
+            return stackIndex
+        } else {
+            let length = max(ranges.count - 1, 0)
+            return (value > ranges[length].to) ? length : 0
         }
-        
-        var stackIndex = 0
-        
-        for range in ranges!
-        {
-            if range.contains(value)
-            {
-                return stackIndex
-            }
-            else
-            {
-                stackIndex += 1
-            }
-        }
-        
-        let length = max(ranges!.count - 1, 0)
-        
-        return (value > ranges![length].to) ? length : 0
     }
 }
diff --git a/Source/Charts/Highlight/ChartHighlighter.swift b/Source/Charts/Highlight/ChartHighlighter.swift
index dd94263899..417ba0d0af 100644
--- a/Source/Charts/Highlight/ChartHighlighter.swift
+++ b/Source/Charts/Highlight/ChartHighlighter.swift
@@ -15,9 +15,9 @@ import CoreGraphics
 open class ChartHighlighter : NSObject, IHighlighter
 {
     /// instance of the data-provider
-    open weak var chart: ChartDataProvider?
+    @objc open weak var chart: ChartDataProvider?
     
-    public init(chart: ChartDataProvider)
+    @objc public init(chart: ChartDataProvider)
     {
         self.chart = chart
     }
@@ -25,117 +25,97 @@ open class ChartHighlighter : NSObject, IHighlighter
     open func getHighlight(x: CGFloat, y: CGFloat) -> Highlight?
     {
         let xVal = Double(getValsForTouch(x: x, y: y).x)
-        
         return getHighlight(xValue: xVal, x: x, y: y)
     }
     
-    /// - returns: The corresponding x-pos for a given touch-position in pixels.
-    /// - parameter x:
-    /// - returns:
-    open func getValsForTouch(x: CGFloat, y: CGFloat) -> CGPoint
+    /// - Parameters:
+    ///   - x:
+    /// - Returns: The corresponding x-pos for a given touch-position in pixels.
+    @objc open func getValsForTouch(x: CGFloat, y: CGFloat) -> CGPoint
     {
-        guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider
-            else { return CGPoint.zero }
+        guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider else { return .zero }
         
         // take any transformer to determine the values
-        return chart.getTransformer(forAxis: YAxis.AxisDependency.left).valueForTouchPoint(x: x, y: y)
+        return chart.getTransformer(forAxis: .left).valueForTouchPoint(x: x, y: y)
     }
     
-    /// - returns: The corresponding ChartHighlight for a given x-value and xy-touch position in pixels.
-    /// - parameter xValue:
-    /// - parameter x:
-    /// - parameter y:
-    /// - returns:
-    open func getHighlight(xValue xVal: Double, x: CGFloat, y: CGFloat) -> Highlight?
+    /// - Parameters:
+    ///   - xValue:
+    ///   - x:
+    ///   - y:
+    /// - Returns: The corresponding ChartHighlight for a given x-value and xy-touch position in pixels.
+    @objc open func getHighlight(xValue xVal: Double, x: CGFloat, y: CGFloat) -> Highlight?
     {
-        guard let chart = chart
-            else { return nil }
+        guard let chart = chart else { return nil }
         
         let closestValues = getHighlights(xValue: xVal, x: x, y: y)
-        if closestValues.isEmpty
-        {
-            return nil
-        }
+        guard !closestValues.isEmpty else { return nil }
         
-        let leftAxisMinDist = getMinimumDistance(closestValues: closestValues, y: y, axis: YAxis.AxisDependency.left)
-        let rightAxisMinDist = getMinimumDistance(closestValues: closestValues, y: y, axis: YAxis.AxisDependency.right)
+        let leftAxisMinDist = getMinimumDistance(closestValues: closestValues, y: y, axis: .left)
+        let rightAxisMinDist = getMinimumDistance(closestValues: closestValues, y: y, axis: .right)
         
-        let axis = leftAxisMinDist < rightAxisMinDist ? YAxis.AxisDependency.left : YAxis.AxisDependency.right
+        let axis: YAxis.AxisDependency = leftAxisMinDist < rightAxisMinDist ? .left : .right
         
         let detail = closestSelectionDetailByPixel(closestValues: closestValues, x: x, y: y, axis: axis, minSelectionDistance: chart.maxHighlightDistance)
         
         return detail
     }
     
-    /// - returns: A list of Highlight objects representing the entries closest to the given xVal.
+    /// - Parameters:
+    ///   - xValue: the transformed x-value of the x-touch position
+    ///   - x: touch position
+    ///   - y: touch position
+    /// - Returns: A list of Highlight objects representing the entries closest to the given xVal.
     /// The returned list contains two objects per DataSet (closest rounding up, closest rounding down).
-    /// - parameter xValue: the transformed x-value of the x-touch position
-    /// - parameter x: touch position
-    /// - parameter y: touch position
-    /// - returns:
-    open func getHighlights(xValue: Double, x: CGFloat, y: CGFloat) -> [Highlight]
+    @objc open func getHighlights(xValue: Double, x: CGFloat, y: CGFloat) -> [Highlight]
     {
         var vals = [Highlight]()
         
-        guard let
-            data = self.data
-            else { return vals }
+        guard let data = self.data else { return vals }
         
         for i in 0 ..< data.dataSetCount
         {
-            guard let dataSet = data.getDataSetByIndex(i)
+            guard
+                let dataSet = data.getDataSetByIndex(i),
+                dataSet.isHighlightEnabled      // don't include datasets that cannot be highlighted
                 else { continue }
             
-            // don't include datasets that cannot be highlighted
-            if !dataSet.isHighlightEnabled
-            {
-                continue
-            }
-            
+
             // extract all y-values from all DataSets at the given x-value.
             // some datasets (i.e bubble charts) make sense to have multiple values for an x-value. We'll have to find a way to handle that later on. It's more complicated now when x-indices are floating point.
-            
             vals.append(contentsOf: buildHighlights(dataSet: dataSet, dataSetIndex: i, xValue: xValue, rounding: .closest))
         }
         
         return vals
     }
     
-    /// - returns: An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex.
+    /// - Returns: An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex.
     internal func buildHighlights(
         dataSet set: IChartDataSet,
         dataSetIndex: Int,
         xValue: Double,
         rounding: ChartDataSetRounding) -> [Highlight]
     {
-        var highlights = [Highlight]()
-        
-        guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider
-            else { return highlights }
+        guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider else { return [] }
         
         var entries = set.entriesForXValue(xValue)
-        if entries.count == 0
+        if entries.count == 0, let closest = set.entryForXValue(xValue, closestToY: .nan, rounding: rounding)
         {
             // Try to find closest x-value and take all entries for that x-value
-            if let closest = set.entryForXValue(xValue, closestToY: Double.nan, rounding: rounding)
-            {
-                entries = set.entriesForXValue(closest.x)
-            }
+            entries = set.entriesForXValue(closest.x)
         }
-        
-        for e in entries
-        {
-            let px = chart.getTransformer(forAxis: set.axisDependency).pixelForValues(x: e.x, y: e.y)
+
+        return entries.map { e in
+            let px = chart.getTransformer(forAxis: set.axisDependency)
+                .pixelForValues(x: e.x, y: e.y)
             
-            highlights.append(Highlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y, dataSetIndex: dataSetIndex, axis: set.axisDependency))
+            return Highlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y, dataSetIndex: dataSetIndex, axis: set.axisDependency)
         }
-        
-        return highlights
     }
 
     // - MARK: - Utilities
     
-    /// - returns: The `ChartHighlight` of the closest value on the x-y cartesian axes
+    /// - Returns: The `ChartHighlight` of the closest value on the x-y cartesian axes
     internal func closestSelectionDetailByPixel(
         closestValues: [Highlight],
         x: CGFloat,
@@ -146,14 +126,12 @@ open class ChartHighlighter : NSObject, IHighlighter
         var distance = minSelectionDistance
         var closest: Highlight?
         
-        for i in 0 ..< closestValues.count
+        for high in closestValues
         {
-            let high = closestValues[i]
-            
             if axis == nil || high.axis == axis
             {
                 let cDistance = getDistance(x1: x, y1: y, x2: high.xPx, y2: high.yPx)
-                
+
                 if cDistance < distance
                 {
                     closest = high
@@ -165,25 +143,20 @@ open class ChartHighlighter : NSObject, IHighlighter
         return closest
     }
     
-    /// - returns: The minimum distance from a touch-y-value (in pixels) to the closest y-value (in pixels) that is displayed in the chart.
+    /// - Returns: The minimum distance from a touch-y-value (in pixels) to the closest y-value (in pixels) that is displayed in the chart.
     internal func getMinimumDistance(
         closestValues: [Highlight],
         y: CGFloat,
-        axis: YAxis.AxisDependency) -> CGFloat
-    {
+        axis: YAxis.AxisDependency
+    ) -> CGFloat {
         var distance = CGFloat.greatestFiniteMagnitude
         
-        for i in 0 ..< closestValues.count
+        for high in closestValues where high.axis == axis
         {
-            let high = closestValues[i]
-            
-            if high.axis == axis
+            let tempDistance = abs(getHighlightPos(high: high) - y)
+            if tempDistance < distance
             {
-                let tempDistance = abs(getHighlightPos(high: high) - y)
-                if tempDistance < distance
-                {
-                    distance = tempDistance
-                }
+                distance = tempDistance
             }
         }
         
diff --git a/Source/Charts/Highlight/CombinedHighlighter.swift b/Source/Charts/Highlight/CombinedHighlighter.swift
index cd2892f201..7053df09d3 100644
--- a/Source/Charts/Highlight/CombinedHighlighter.swift
+++ b/Source/Charts/Highlight/CombinedHighlighter.swift
@@ -16,9 +16,9 @@ import CoreGraphics
 open class CombinedHighlighter: ChartHighlighter
 {
     /// bar highlighter for supporting stacked highlighting
-    fileprivate var barHighlighter: BarHighlighter?
+    private var barHighlighter: BarHighlighter?
     
-    public init(chart: CombinedChartDataProvider, barDataProvider: BarChartDataProvider)
+    @objc public init(chart: CombinedChartDataProvider, barDataProvider: BarChartDataProvider)
     {
         super.init(chart: chart)
         
@@ -30,46 +30,38 @@ open class CombinedHighlighter: ChartHighlighter
     {
         var vals = [Highlight]()
         
-        guard let chart = self.chart as? CombinedChartDataProvider
+        guard
+            let chart = self.chart as? CombinedChartDataProvider,
+            let dataObjects = chart.combinedData?.allData
             else { return vals }
         
-        if let dataObjects = chart.combinedData?.allData
+        for i in 0..<dataObjects.count
         {
-            for i in 0..<dataObjects.count
+            let dataObject = dataObjects[i]
+
+            // in case of BarData, let the BarHighlighter take over
+            if barHighlighter != nil && dataObject is BarChartData,
+                let high = barHighlighter?.getHighlight(x: x, y: y)
+            {
+                high.dataIndex = i
+                vals.append(high)
+            }
+            else
             {
-                let dataObject = dataObjects[i]
-                
-                // in case of BarData, let the BarHighlighter take over
-                if barHighlighter != nil && dataObject is BarChartData
+                for j in 0..<dataObject.dataSetCount
                 {
-                    if let high = barHighlighter?.getHighlight(x: x, y: y)
+                    guard let dataSet = dataObject.getDataSetByIndex(j),
+                        dataSet.isHighlightEnabled      // don't include datasets that cannot be highlighted
+                        else { continue }
+
+                    let highs = buildHighlights(dataSet: dataSet, dataSetIndex: j, xValue: xValue, rounding: .closest)
+
+                    for high in highs
                     {
                         high.dataIndex = i
                         vals.append(high)
                     }
                 }
-                else
-                {
-                    for j in 0..<dataObject.dataSetCount
-                    {
-                        guard let dataSet = dataObjects[i].getDataSetByIndex(j)
-                            else { continue }
-                        
-                        // don't include datasets that cannot be highlighted
-                        if !dataSet.isHighlightEnabled
-                        {
-                            continue
-                        }
-                        
-                        let highs = buildHighlights(dataSet: dataSet, dataSetIndex: j, xValue: xValue, rounding: .closest)
-                        
-                        for high in highs
-                        {
-                            high.dataIndex = i
-                            vals.append(high)
-                        }
-                    }
-                }
             }
         }
         
diff --git a/Source/Charts/Highlight/Highlight.swift b/Source/Charts/Highlight/Highlight.swift
index fb08e49860..d1692d3fbb 100644
--- a/Source/Charts/Highlight/Highlight.swift
+++ b/Source/Charts/Highlight/Highlight.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 @objc(ChartHighlight)
 open class Highlight: NSObject
@@ -21,13 +22,13 @@ open class Highlight: NSObject
     fileprivate var _y = Double.nan
     
     /// the x-pixel of the highlight
-    fileprivate var _xPx = CGFloat.nan
+    private var _xPx = CGFloat.nan
     
     /// the y-pixel of the highlight
-    fileprivate var _yPx = CGFloat.nan
+    private var _yPx = CGFloat.nan
     
     /// the index of the data object - in case it refers to more than one
-    open var dataIndex = Int(-1)
+    @objc open var dataIndex = Int(-1)
     
     /// the index of the dataset the highlighted value is in
     fileprivate var _dataSetIndex = Int(0)
@@ -38,28 +39,29 @@ open class Highlight: NSObject
     fileprivate var _stackIndex = Int(-1)
     
     /// the axis the highlighted value belongs to
-    fileprivate var _axis: YAxis.AxisDependency = YAxis.AxisDependency.left
+    private var _axis: YAxis.AxisDependency = YAxis.AxisDependency.left
     
     /// the x-position (pixels) on which this highlight object was last drawn
-    open var drawX: CGFloat = 0.0
+    @objc open var drawX: CGFloat = 0.0
     
     /// the y-position (pixels) on which this highlight object was last drawn
-    open var drawY: CGFloat = 0.0
+    @objc open var drawY: CGFloat = 0.0
     
     public override init()
     {
         super.init()
     }
     
-    /// - parameter x: the x-value of the highlighted value
-    /// - parameter y: the y-value of the highlighted value
-    /// - parameter xPx: the x-pixel of the highlighted value
-    /// - parameter yPx: the y-pixel of the highlighted value
-    /// - parameter dataIndex: the index of the Data the highlighted value belongs to
-    /// - parameter dataSetIndex: the index of the DataSet the highlighted value belongs to
-    /// - parameter stackIndex: references which value of a stacked-bar entry has been selected
-    /// - parameter axis: the axis the highlighted value belongs to
-    public init(
+    /// - Parameters:
+    ///   - x: the x-value of the highlighted value
+    ///   - y: the y-value of the highlighted value
+    ///   - xPx: the x-pixel of the highlighted value
+    ///   - yPx: the y-pixel of the highlighted value
+    ///   - dataIndex: the index of the Data the highlighted value belongs to
+    ///   - dataSetIndex: the index of the DataSet the highlighted value belongs to
+    ///   - stackIndex: references which value of a stacked-bar entry has been selected
+    ///   - axis: the axis the highlighted value belongs to
+    @objc public init(
         x: Double, y: Double,
         xPx: CGFloat, yPx: CGFloat,
         dataIndex: Int,
@@ -79,14 +81,15 @@ open class Highlight: NSObject
         _axis = axis
     }
     
-    /// - parameter x: the x-value of the highlighted value
-    /// - parameter y: the y-value of the highlighted value
-    /// - parameter xPx: the x-pixel of the highlighted value
-    /// - parameter yPx: the y-pixel of the highlighted value
-    /// - parameter dataSetIndex: the index of the DataSet the highlighted value belongs to
-    /// - parameter stackIndex: references which value of a stacked-bar entry has been selected
-    /// - parameter axis: the axis the highlighted value belongs to
-    public convenience init(
+    /// - Parameters:
+    ///   - x: the x-value of the highlighted value
+    ///   - y: the y-value of the highlighted value
+    ///   - xPx: the x-pixel of the highlighted value
+    ///   - yPx: the y-pixel of the highlighted value
+    ///   - dataSetIndex: the index of the DataSet the highlighted value belongs to
+    ///   - stackIndex: references which value of a stacked-bar entry has been selected
+    ///   - axis: the axis the highlighted value belongs to
+    @objc public convenience init(
         x: Double, y: Double,
         xPx: CGFloat, yPx: CGFloat,
         dataSetIndex: Int,
@@ -100,15 +103,16 @@ open class Highlight: NSObject
                   axis: axis)
     }
     
-    /// - parameter x: the x-value of the highlighted value
-    /// - parameter y: the y-value of the highlighted value
-    /// - parameter xPx: the x-pixel of the highlighted value
-    /// - parameter yPx: the y-pixel of the highlighted value
-    /// - parameter dataIndex: the index of the Data the highlighted value belongs to
-    /// - parameter dataSetIndex: the index of the DataSet the highlighted value belongs to
-    /// - parameter stackIndex: references which value of a stacked-bar entry has been selected
-    /// - parameter axis: the axis the highlighted value belongs to
-    public init(
+    /// - Parameters:
+    ///   - x: the x-value of the highlighted value
+    ///   - y: the y-value of the highlighted value
+    ///   - xPx: the x-pixel of the highlighted value
+    ///   - yPx: the y-pixel of the highlighted value
+    ///   - dataIndex: the index of the Data the highlighted value belongs to
+    ///   - dataSetIndex: the index of the DataSet the highlighted value belongs to
+    ///   - stackIndex: references which value of a stacked-bar entry has been selected
+    ///   - axis: the axis the highlighted value belongs to
+    @objc public init(
         x: Double, y: Double,
         xPx: CGFloat, yPx: CGFloat,
         dataSetIndex: Int,
@@ -124,44 +128,48 @@ open class Highlight: NSObject
         _axis = axis
     }
     
-    /// - parameter x: the x-value of the highlighted value
-    /// - parameter y: the y-value of the highlighted value
-    /// - parameter dataSetIndex: the index of the DataSet the highlighted value belongs to
-    public init(x: Double, y: Double, dataSetIndex: Int)
+    /// - Parameters:
+    ///   - x: the x-value of the highlighted value
+    ///   - y: the y-value of the highlighted value
+    ///   - dataSetIndex: the index of the DataSet the highlighted value belongs to
+    ///   - dataIndex: The data index to search in (only used in CombinedChartView currently)
+    @objc public init(x: Double, y: Double, dataSetIndex: Int, dataIndex: Int = -1)
     {
         _x = x
         _y = y
         _dataSetIndex = dataSetIndex
+        self.dataIndex = dataIndex
     }
     
-    /// - parameter x: the x-value of the highlighted value
-    /// - parameter dataSetIndex: the index of the DataSet the highlighted value belongs to
-    /// - parameter stackIndex: references which value of a stacked-bar entry has been selected
-    public convenience init(x: Double, dataSetIndex: Int, stackIndex: Int)
+    /// - Parameters:
+    ///   - x: the x-value of the highlighted value
+    ///   - dataSetIndex: the index of the DataSet the highlighted value belongs to
+    ///   - stackIndex: references which value of a stacked-bar entry has been selected
+    @objc public convenience init(x: Double, dataSetIndex: Int, stackIndex: Int)
     {
         self.init(x: x, y: Double.nan, dataSetIndex: dataSetIndex)
         _stackIndex = stackIndex
     }
     
-    open var x: Double { return _x }
-    open var y: Double { return _y }
-    open var xPx: CGFloat { return _xPx }
-    open var yPx: CGFloat { return _yPx }
-    open var dataSetIndex: Int { return _dataSetIndex }
-    open var stackIndex: Int { return _stackIndex }
-    open var axis: YAxis.AxisDependency { return _axis }
+    @objc open var x: Double { return _x }
+    @objc open var y: Double { return _y }
+    @objc open var xPx: CGFloat { return _xPx }
+    @objc open var yPx: CGFloat { return _yPx }
+    @objc open var dataSetIndex: Int { return _dataSetIndex }
+    @objc open var stackIndex: Int { return _stackIndex }
+    @objc open var axis: YAxis.AxisDependency { return _axis }
     
-    open var isStacked: Bool { return _stackIndex >= 0 }
+    @objc open var isStacked: Bool { return _stackIndex >= 0 }
     
     /// Sets the x- and y-position (pixels) where this highlight was last drawn.
-    open func setDraw(x: CGFloat, y: CGFloat)
+    @objc open func setDraw(x: CGFloat, y: CGFloat)
     {
         self.drawX = x
         self.drawY = y
     }
     
     /// Sets the x- and y-position (pixels) where this highlight was last drawn.
-    open func setDraw(pt: CGPoint)
+    @objc open func setDraw(pt: CGPoint)
     {
         self.drawX = pt.x
         self.drawY = pt.y
@@ -173,17 +181,19 @@ open class Highlight: NSObject
     {
         return "Highlight, x: \(_x), y: \(_y), dataIndex (combined charts): \(dataIndex), dataSetIndex: \(_dataSetIndex), stackIndex (only stacked barentry): \(_stackIndex)"
     }
-    
 }
+
+
+// MARK: Equatable
 extension Highlight /*: Equatable*/ {
     open override func isEqual(_ object: Any?) -> Bool {
         guard let object = object as? Highlight else { return false }
-        
+
         if self === object
         {
             return true
         }
-        
+
         return _x == object._x
             && _y == object._y
             && dataIndex == object.dataIndex
@@ -191,43 +201,3 @@ extension Highlight /*: Equatable*/ {
             && _stackIndex == object._stackIndex
     }
 }
-
-func ==(lhs: Highlight, rhs: Highlight) -> Bool
-{
-    if lhs === rhs
-    {
-        return true
-    }
-    
-    if !lhs.isKind(of: type(of: rhs))
-    {
-        return false
-    }
-    
-    if lhs._x != rhs._x
-    {
-        return false
-    }
-    
-    if lhs._y != rhs._y
-    {
-        return false
-    }
-    
-    if lhs.dataIndex != rhs.dataIndex
-    {
-        return false
-    }
-    
-    if lhs._dataSetIndex != rhs._dataSetIndex
-    {
-        return false
-    }
-    
-    if lhs._stackIndex != rhs._stackIndex
-    {
-        return false
-    }
-    
-    return true
-}
diff --git a/Source/Charts/Highlight/HorizontalBarHighlighter.swift b/Source/Charts/Highlight/HorizontalBarHighlighter.swift
index eec39c807e..103d53f982 100644
--- a/Source/Charts/Highlight/HorizontalBarHighlighter.swift
+++ b/Source/Charts/Highlight/HorizontalBarHighlighter.swift
@@ -17,25 +17,21 @@ open class HorizontalBarHighlighter: BarHighlighter
 {
     open override func getHighlight(x: CGFloat, y: CGFloat) -> Highlight?
     {
-        if let barData = self.chart?.data as? BarChartData
+        guard let barData = self.chart?.data as? BarChartData else { return nil }
+
+        let pos = getValsForTouch(x: y, y: x)
+        guard let high = getHighlight(xValue: Double(pos.y), x: y, y: x) else { return nil }
+
+        if let set = barData.getDataSetByIndex(high.dataSetIndex) as? IBarChartDataSet,
+            set.isStacked
         {
-            let pos = getValsForTouch(x: y, y: x)
-            
-            guard let high = getHighlight(xValue: Double(pos.y), x: y, y: x)
-                else { return nil }
-            
-            if let set = barData.getDataSetByIndex(high.dataSetIndex) as? IBarChartDataSet,
-                set.isStacked
-            {
-                return getStackedHighlight(high: high,
-                                           set: set,
-                                           xValue: Double(pos.y),
-                                           yValue: Double(pos.x))
-            }
-            
-            return high
+            return getStackedHighlight(high: high,
+                                       set: set,
+                                       xValue: Double(pos.y),
+                                       yValue: Double(pos.x))
         }
-        return nil
+
+        return high
     }
     
     internal override func buildHighlights(
@@ -44,29 +40,20 @@ open class HorizontalBarHighlighter: BarHighlighter
         xValue: Double,
         rounding: ChartDataSetRounding) -> [Highlight]
     {
-        var highlights = [Highlight]()
-        
-        guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider
-            else { return highlights }
+        guard let chart = self.chart as? BarLineScatterCandleBubbleChartDataProvider else { return [] }
         
         var entries = set.entriesForXValue(xValue)
-        if entries.count == 0
+        if entries.count == 0, let closest = set.entryForXValue(xValue, closestToY: .nan, rounding: rounding)
         {
             // Try to find closest x-value and take all entries for that x-value
-            if let closest = set.entryForXValue(xValue, closestToY: Double.nan, rounding: rounding)
-            {
-                entries = set.entriesForXValue(closest.x)
-            }
+            entries = set.entriesForXValue(closest.x)
         }
-        
-        for e in entries
-        {
-            let px = chart.getTransformer(forAxis: set.axisDependency).pixelForValues(x: e.y, y: e.x)
-            
-            highlights.append(Highlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y, dataSetIndex: dataSetIndex, axis: set.axisDependency))
+
+        return entries.map { e in
+            let px = chart.getTransformer(forAxis: set.axisDependency)
+                .pixelForValues(x: e.y, y: e.x)
+            return Highlight(x: e.x, y: e.y, xPx: px.x, yPx: px.y, dataSetIndex: dataSetIndex, axis: set.axisDependency)
         }
-        
-        return highlights
     }
     
     internal override func getDistance(x1: CGFloat, y1: CGFloat, x2: CGFloat, y2: CGFloat) -> CGFloat
diff --git a/Source/Charts/Highlight/IHighlighter.swift b/Source/Charts/Highlight/IHighlighter.swift
index 4b3a2f62e5..21ae298c34 100644
--- a/Source/Charts/Highlight/IHighlighter.swift
+++ b/Source/Charts/Highlight/IHighlighter.swift
@@ -13,11 +13,11 @@ import Foundation
 import CoreGraphics
 
 @objc(IChartHighlighter)
-public protocol IHighlighter : NSObjectProtocol
+public protocol IHighlighter: class
 {
-    /// - returns: A Highlight object corresponding to the given x- and y- touch positions in pixels.
-    /// - parameter x:
-    /// - parameter y:
-    /// - returns:
+    /// - Parameters:
+    ///   - x:
+    ///   - y:
+    /// - Returns: A Highlight object corresponding to the given x- and y- touch positions in pixels.
     func getHighlight(x: CGFloat, y: CGFloat) -> Highlight?
 }
diff --git a/Source/Charts/Highlight/PieHighlighter.swift b/Source/Charts/Highlight/PieHighlighter.swift
index 2d0a18534e..54bb3d7b83 100644
--- a/Source/Charts/Highlight/PieHighlighter.swift
+++ b/Source/Charts/Highlight/PieHighlighter.swift
@@ -17,12 +17,11 @@ open class PieHighlighter: PieRadarHighlighter
 {
     open override func closestHighlight(index: Int, x: CGFloat, y: CGFloat) -> Highlight?
     {
-        guard let set = chart?.data?.dataSets[0]
+        guard
+            let set = chart?.data?.dataSets[0],
+            let entry = set.entryForIndex(index)
             else { return nil }
-        
-        guard let entry = set.entryForIndex(index)
-            else { return nil }
-        
+                
         return Highlight(x: Double(index), y: entry.y, xPx: x, yPx: y, dataSetIndex: 0, axis: set.axisDependency)
     }
 }
diff --git a/Source/Charts/Highlight/PieRadarHighlighter.swift b/Source/Charts/Highlight/PieRadarHighlighter.swift
index 9b50de83e3..c55988ab31 100644
--- a/Source/Charts/Highlight/PieRadarHighlighter.swift
+++ b/Source/Charts/Highlight/PieRadarHighlighter.swift
@@ -17,45 +17,44 @@ open class PieRadarHighlighter: ChartHighlighter
 {    
     open override func getHighlight(x: CGFloat, y: CGFloat) -> Highlight?
     {
-        guard let chart = self.chart as? PieRadarChartViewBase
-            else { return nil }
+        guard let chart = self.chart as? PieRadarChartViewBase else { return nil }
         
         let touchDistanceToCenter = chart.distanceToCenter(x: x, y: y)
         
         // check if a slice was touched
-        if touchDistanceToCenter > chart.radius
+        guard touchDistanceToCenter <= chart.radius else
         {
             // if no slice was touched, highlight nothing
             return nil
         }
+
+        var angle = chart.angleForPoint(x: x ,y: y)
+
+        if chart is PieChartView
+        {
+            angle /= CGFloat(chart.chartAnimator.phaseY)
+        }
+
+        let index = chart.indexForAngle(angle)
+
+        // check if the index could be found
+        if index < 0 || index >= chart.data?.maxEntryCountSet?.entryCount ?? 0
+        {
+            return nil
+        }
         else
         {
-            var angle = chart.angleForPoint(x: x ,y: y)
-            
-            if chart is PieChartView
-            {
-                angle /= CGFloat(chart.chartAnimator.phaseY)
-            }
-            
-            let index = chart.indexForAngle(angle)
-            
-            // check if the index could be found
-            if index < 0 || index >= chart.data?.maxEntryCountSet?.entryCount ?? 0
-            {
-                return nil
-            }
-            else
-            {
-                return closestHighlight(index: index, x: x, y: y)
-            }
+            return closestHighlight(index: index, x: x, y: y)
         }
+
     }
     
-    /// - returns: The closest Highlight object of the given objects based on the touch position inside the chart.
-    /// - parameter index:
-    /// - parameter x:
-    /// - parameter y:
-    open func closestHighlight(index: Int, x: CGFloat, y: CGFloat) -> Highlight?
+    /// - Parameters:
+    ///   - index:
+    ///   - x:
+    ///   - y:
+    /// - Returns: The closest Highlight object of the given objects based on the touch position inside the chart.
+    @objc open func closestHighlight(index: Int, x: CGFloat, y: CGFloat) -> Highlight?
     {
         fatalError("closestHighlight(index, x, y) cannot be called on PieRadarChartHighlighter")
     }
diff --git a/Source/Charts/Highlight/RadarHighlighter.swift b/Source/Charts/Highlight/RadarHighlighter.swift
index 8df2d3195a..cfaf57aec9 100644
--- a/Source/Charts/Highlight/RadarHighlighter.swift
+++ b/Source/Charts/Highlight/RadarHighlighter.swift
@@ -17,14 +17,13 @@ open class RadarHighlighter: PieRadarHighlighter
 {
     open override func closestHighlight(index: Int, x: CGFloat, y: CGFloat) -> Highlight?
     {
-        guard let chart = self.chart as? RadarChartView
-            else { return nil }
+        guard let chart = self.chart as? RadarChartView else { return nil }
         
         let highlights = getHighlights(forIndex: index)
         
         let distanceToCenter = Double(chart.distanceToCenter(x: x, y: y) / chart.factor)
         
-        var closest: Highlight? = nil
+        var closest: Highlight?
         var distance = Double.greatestFiniteMagnitude
         
         for high in highlights
@@ -40,38 +39,38 @@ open class RadarHighlighter: PieRadarHighlighter
         return closest
     }
     
-    /// - returns: An array of Highlight objects for the given index.
+    /// - Parameters:
+    ///   - index:
+    /// - Returns: An array of Highlight objects for the given index.
     /// The Highlight objects give information about the value at the selected index and DataSet it belongs to.
-    ///
-    /// - parameter index:
     internal func getHighlights(forIndex index: Int) -> [Highlight]
     {
         var vals = [Highlight]()
         
-        guard let chart = self.chart as? RadarChartView
+        guard
+            let chart = self.chart as? RadarChartView,
+            let chartData = chart.data
             else { return vals }
         
         let phaseX = chart.chartAnimator.phaseX
         let phaseY = chart.chartAnimator.phaseY
         let sliceangle = chart.sliceAngle
         let factor = chart.factor
-        
-        for i in 0..<(chart.data?.dataSetCount ?? 0)
+
+        for i in chartData.dataSets.indices
         {
-            guard let dataSet = chart.data?.getDataSetByIndex(i)
-                else { continue }
-            
-            guard let entry = dataSet.entryForIndex(index)
+            guard
+                let dataSet = chartData.getDataSetByIndex(i),
+                let entry = dataSet.entryForIndex(index)
                 else { continue }
             
             let y = (entry.y - chart.chartYMin)
             
-            let p = ChartUtils.getPosition(
-                center: chart.centerOffsets,
-                dist: CGFloat(y) * factor * CGFloat(phaseY),
-                angle: sliceangle * CGFloat(index) * CGFloat(phaseX) + chart.rotationAngle)
-            
-            vals.append(Highlight(x: Double(index), y: entry.y, xPx: p.x, yPx: p.y, dataSetIndex: i, axis: dataSet.axisDependency))
+            let p = chart.centerOffsets.moving(distance: CGFloat(y) * factor * CGFloat(phaseY),
+                                               atAngle: sliceangle * CGFloat(index) * CGFloat(phaseX) + chart.rotationAngle)
+
+            let highlight = Highlight(x: Double(index), y: entry.y, xPx: p.x, yPx: p.y, dataSetIndex: i, axis: dataSet.axisDependency)
+            vals.append(highlight)
         }
         
         return vals
diff --git a/Source/Charts/Highlight/Range.swift b/Source/Charts/Highlight/Range.swift
index 298dca118a..4b7ead10fb 100644
--- a/Source/Charts/Highlight/Range.swift
+++ b/Source/Charts/Highlight/Range.swift
@@ -14,10 +14,10 @@ import Foundation
 @objc(ChartRange)
 open class Range: NSObject
 {
-    open var from: Double
-    open var to: Double
+    @objc open var from: Double
+    @objc open var to: Double
     
-    public init(from: Double, to: Double)
+    @objc public init(from: Double, to: Double)
     {
         self.from = from
         self.to = to
@@ -25,9 +25,10 @@ open class Range: NSObject
         super.init()
     }
 
-    /// - returns: `true` if this range contains (if the value is in between) the given value, `false` ifnot.
-    /// - parameter value:
-    open func contains(_ value: Double) -> Bool
+    /// - Parameters:
+    ///   - value:
+    /// - Returns: `true` if this range contains (if the value is in between) the given value, `false` ifnot.
+    @objc open func contains(_ value: Double) -> Bool
     {
         if value > from && value <= to
         {
@@ -39,12 +40,12 @@ open class Range: NSObject
         }
     }
     
-    open func isLarger(_ value: Double) -> Bool
+    @objc open func isLarger(_ value: Double) -> Bool
     {
         return value > to
     }
     
-    open func isSmaller(_ value: Double) -> Bool
+    @objc open func isSmaller(_ value: Double) -> Bool
     {
         return value < from
     }
diff --git a/Source/Charts/Interfaces/ChartDataProvider.swift b/Source/Charts/Interfaces/ChartDataProvider.swift
index 99619331c0..531f04b750 100644
--- a/Source/Charts/Interfaces/ChartDataProvider.swift
+++ b/Source/Charts/Interfaces/ChartDataProvider.swift
@@ -15,16 +15,16 @@ import CoreGraphics
 @objc
 public protocol ChartDataProvider
 {
-    /// - returns: The minimum x-value of the chart, regardless of zoom or translation.
+    /// The minimum x-value of the chart, regardless of zoom or translation.
     var chartXMin: Double { get }
     
-    /// - returns: The maximum x-value of the chart, regardless of zoom or translation.
+    /// The maximum x-value of the chart, regardless of zoom or translation.
     var chartXMax: Double { get }
     
-    /// - returns: The minimum y-value of the chart, regardless of zoom or translation.
+    /// The minimum y-value of the chart, regardless of zoom or translation.
     var chartYMin: Double { get }
     
-    /// - returns: The maximum y-value of the chart, regardless of zoom or translation.
+    /// The maximum y-value of the chart, regardless of zoom or translation.
     var chartYMax: Double { get }
     
     var maxHighlightDistance: CGFloat { get }
@@ -36,4 +36,4 @@ public protocol ChartDataProvider
     var data: ChartData? { get }
     
     var maxVisibleCount: Int { get }
-}
\ No newline at end of file
+}
diff --git a/Source/Charts/Jobs/AnimatedMoveViewJob.swift b/Source/Charts/Jobs/AnimatedMoveViewJob.swift
index b2dc5d2205..7a75822161 100644
--- a/Source/Charts/Jobs/AnimatedMoveViewJob.swift
+++ b/Source/Charts/Jobs/AnimatedMoveViewJob.swift
@@ -12,34 +12,8 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 open class AnimatedMoveViewJob: AnimatedViewPortJob
 {
-    public override init(
-        viewPortHandler: ViewPortHandler,
-        xValue: Double,
-        yValue: Double,
-        transformer: Transformer,
-        view: ChartViewBase,
-        xOrigin: CGFloat,
-        yOrigin: CGFloat,
-        duration: TimeInterval,
-        easing: ChartEasingFunctionBlock?)
-    {
-        super.init(viewPortHandler: viewPortHandler,
-            xValue: xValue,
-            yValue: yValue,
-            transformer: transformer,
-            view: view,
-            xOrigin: xOrigin,
-            yOrigin: yOrigin,
-            duration: duration,
-            easing: easing)
-    }
-    
     internal override func animationUpdate()
     {
         guard
diff --git a/Source/Charts/Jobs/AnimatedViewPortJob.swift b/Source/Charts/Jobs/AnimatedViewPortJob.swift
index 25f113ef0c..1bdfedf5bd 100644
--- a/Source/Charts/Jobs/AnimatedViewPortJob.swift
+++ b/Source/Charts/Jobs/AnimatedViewPortJob.swift
@@ -11,10 +11,7 @@
 
 import Foundation
 import CoreGraphics
-
-#if !os(OSX)
-    import UIKit
-#endif
+import QuartzCore
 
 open class AnimatedViewPortJob: ViewPortJob
 {
@@ -22,14 +19,14 @@ open class AnimatedViewPortJob: ViewPortJob
     internal var xOrigin: CGFloat = 0.0
     internal var yOrigin: CGFloat = 0.0
     
-    fileprivate var _startTime: TimeInterval = 0.0
-    fileprivate var _displayLink: NSUIDisplayLink!
-    fileprivate var _duration: TimeInterval = 0.0
-    fileprivate var _endTime: TimeInterval = 0.0
+    private var _startTime: TimeInterval = 0.0
+    private var _displayLink: NSUIDisplayLink!
+    private var _duration: TimeInterval = 0.0
+    private var _endTime: TimeInterval = 0.0
     
-    fileprivate var _easing: ChartEasingFunctionBlock?
+    private var _easing: ChartEasingFunctionBlock?
     
-    public init(
+    @objc public init(
         viewPortHandler: ViewPortHandler,
         xValue: Double,
         yValue: Double,
@@ -62,7 +59,7 @@ open class AnimatedViewPortJob: ViewPortJob
         start()
     }
     
-    open func start()
+    @objc open func start()
     {
         _startTime = CACurrentMediaTime()
         _endTime = _startTime + _duration
@@ -71,52 +68,40 @@ open class AnimatedViewPortJob: ViewPortJob
         updateAnimationPhase(_startTime)
         
         _displayLink = NSUIDisplayLink(target: self, selector: #selector(animationLoop))
-        _displayLink.add(to: RunLoop.main, forMode: RunLoopMode.commonModes)
+        _displayLink.add(to: .main, forMode: RunLoop.Mode.common)
     }
     
-    open func stop(finish: Bool)
+    @objc open func stop(finish: Bool)
     {
-        if _displayLink != nil
+        guard _displayLink != nil else { return }
+
+        _displayLink.remove(from: .main, forMode: RunLoop.Mode.common)
+        _displayLink = nil
+
+        if finish
         {
-            _displayLink.remove(from: RunLoop.main, forMode: RunLoopMode.commonModes)
-            _displayLink = nil
-            
-            if finish
+            if phase != 1.0
             {
-                if phase != 1.0
-                {
-                    phase = 1.0
-                    phase = 1.0
-                    
-                    animationUpdate()
-                }
-                
-                animationEnd()
+                phase = 1.0
+                animationUpdate()
             }
+
+            animationEnd()
         }
     }
     
-    fileprivate func updateAnimationPhase(_ currentTime: TimeInterval)
+    private func updateAnimationPhase(_ currentTime: TimeInterval)
     {
-        let elapsedTime: TimeInterval = currentTime - _startTime
-        let duration: TimeInterval = _duration
-        var elapsed: TimeInterval = elapsedTime
-        if elapsed > duration
-        {
-            elapsed = duration
-        }
-        
-        if _easing != nil
-        {
-            phase = CGFloat(_easing!(elapsed, duration))
-        }
-        else
-        {
-            phase = CGFloat(elapsed / duration)
-        }
+        let elapsedTime = currentTime - _startTime
+        let duration = _duration
+        var elapsed = elapsedTime
+
+        elapsed = min(elapsed, duration)
+
+        phase = CGFloat(_easing?(elapsed, duration) ?? elapsed / duration)
     }
     
-    @objc fileprivate func animationLoop()
+    @objc private func animationLoop()
     {
         let currentTime: TimeInterval = CACurrentMediaTime()
         
@@ -132,7 +117,7 @@ open class AnimatedViewPortJob: ViewPortJob
     
     internal func animationUpdate()
     {
-        // Override this
+       // Override this
     }
     
     internal func animationEnd()
diff --git a/Source/Charts/Jobs/AnimatedZoomViewJob.swift b/Source/Charts/Jobs/AnimatedZoomViewJob.swift
index 92b003e078..4e9d5fd981 100644
--- a/Source/Charts/Jobs/AnimatedZoomViewJob.swift
+++ b/Source/Charts/Jobs/AnimatedZoomViewJob.swift
@@ -23,7 +23,7 @@ open class AnimatedZoomViewJob: AnimatedViewPortJob
     internal var zoomCenterX: CGFloat = 0.0
     internal var zoomCenterY: CGFloat = 0.0
 
-    public init(
+    @objc public init(
         viewPortHandler: ViewPortHandler,
         transformer: Transformer,
         view: ChartViewBase,
@@ -72,7 +72,7 @@ open class AnimatedZoomViewJob: AnimatedViewPortJob
         let scaleY = yOrigin + (self.scaleY - yOrigin) * phase
         
         var matrix = viewPortHandler.setZoom(scaleX: scaleX, scaleY: scaleY)
-        let _ = viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: false)
+        viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: false)
         
         let valsInView = CGFloat(yAxis?.axisRange ?? 0.0) / viewPortHandler.scaleY
         let xsInView = CGFloat(xAxisRange) / viewPortHandler.scaleX
@@ -85,7 +85,7 @@ open class AnimatedZoomViewJob: AnimatedViewPortJob
         transformer.pointValueToPixel(&pt)
         
         matrix = viewPortHandler.translate(pt: pt)
-        let _ = viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: true)
+        viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: true)
     }
     
     internal override func animationEnd()
diff --git a/Source/Charts/Jobs/MoveViewJob.swift b/Source/Charts/Jobs/MoveViewJob.swift
index b175b1707e..0b6ca320e5 100644
--- a/Source/Charts/Jobs/MoveViewJob.swift
+++ b/Source/Charts/Jobs/MoveViewJob.swift
@@ -12,28 +12,9 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 @objc(MoveChartViewJob)
 open class MoveViewJob: ViewPortJob
-{
-    public override init(
-        viewPortHandler: ViewPortHandler,
-        xValue: Double,
-        yValue: Double,
-        transformer: Transformer,
-        view: ChartViewBase)
-    {
-        super.init(
-            viewPortHandler: viewPortHandler,
-            xValue: xValue,
-            yValue: yValue,
-            transformer: transformer,
-            view: view)
-    }
-    
+{    
     open override func doJob()
     {
         guard
@@ -43,8 +24,8 @@ open class MoveViewJob: ViewPortJob
             else { return }
         
         var pt = CGPoint(
-            x: CGFloat(xValue),
-            y: CGFloat(yValue)
+            x: xValue,
+            y: yValue
         )
         
         transformer.pointValueToPixel(&pt)
diff --git a/Source/Charts/Jobs/ViewPortJob.swift b/Source/Charts/Jobs/ViewPortJob.swift
index 503329e560..c52562ed53 100644
--- a/Source/Charts/Jobs/ViewPortJob.swift
+++ b/Source/Charts/Jobs/ViewPortJob.swift
@@ -23,7 +23,7 @@ open class ViewPortJob: NSObject
     internal weak var transformer: Transformer?
     internal weak var view: ChartViewBase?
     
-    public init(
+    @objc public init(
         viewPortHandler: ViewPortHandler,
         xValue: Double,
         yValue: Double,
@@ -39,8 +39,8 @@ open class ViewPortJob: NSObject
         self.view = view
     }
     
-    open func doJob()
+    @objc open func doJob()
     {
-        // Override this
+        fatalError("`doJob()` must be overridden by subclasses")
     }
 }
diff --git a/Source/Charts/Jobs/ZoomViewJob.swift b/Source/Charts/Jobs/ZoomViewJob.swift
index bfeec98788..a6a79394da 100644
--- a/Source/Charts/Jobs/ZoomViewJob.swift
+++ b/Source/Charts/Jobs/ZoomViewJob.swift
@@ -12,18 +12,14 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 @objc(ZoomChartViewJob)
 open class ZoomViewJob: ViewPortJob
 {
     internal var scaleX: CGFloat = 0.0
     internal var scaleY: CGFloat = 0.0
-    internal var axisDependency: YAxis.AxisDependency = YAxis.AxisDependency.left
+    internal var axisDependency: YAxis.AxisDependency = .left
     
-    public init(
+    @objc public init(
         viewPortHandler: ViewPortHandler,
         scaleX: CGFloat,
         scaleY: CGFloat,
@@ -54,7 +50,7 @@ open class ZoomViewJob: ViewPortJob
             else { return }
         
         var matrix = viewPortHandler.setZoom(scaleX: scaleX, scaleY: scaleY)
-        let _ = viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: false)
+        viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: false)
         
         let yValsInView = (view as! BarLineChartViewBase).getAxis(axisDependency).axisRange / Double(viewPortHandler.scaleY)
         let xValsInView = (view as! BarLineChartViewBase).xAxis.axisRange / Double(viewPortHandler.scaleX)
@@ -67,7 +63,7 @@ open class ZoomViewJob: ViewPortJob
         transformer.pointValueToPixel(&pt)
         
         matrix = viewPortHandler.translate(pt: pt)
-        let _ = viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: false)
+        viewPortHandler.refresh(newMatrix: matrix, chart: view, invalidate: false)
         
         (view as! BarLineChartViewBase).calculateOffsets()
         view.setNeedsDisplay()
diff --git a/Source/Charts/Renderers/AxisRendererBase.swift b/Source/Charts/Renderers/AxisRendererBase.swift
index 0032c13dc2..302bdf5312 100644
--- a/Source/Charts/Renderers/AxisRendererBase.swift
+++ b/Source/Charts/Renderers/AxisRendererBase.swift
@@ -16,17 +16,12 @@ import CoreGraphics
 open class AxisRendererBase: Renderer
 {
     /// base axis this axis renderer works with
-    open var axis: AxisBase?
+    @objc open var axis: AxisBase?
     
     /// transformer to transform values to screen pixels and return
-    open var transformer: Transformer?
-    
-    public override init()
-    {
-        super.init()
-    }
-    
-    public init(viewPortHandler: ViewPortHandler?, transformer: Transformer?, axis: AxisBase?)
+    @objc open var transformer: Transformer?
+
+    @objc public init(viewPortHandler: ViewPortHandler, transformer: Transformer?, axis: AxisBase?)
     {
         super.init(viewPortHandler: viewPortHandler)
         
@@ -35,56 +30,55 @@ open class AxisRendererBase: Renderer
     }
     
     /// Draws the axis labels on the specified context
-    open func renderAxisLabels(context: CGContext)
+    @objc open func renderAxisLabels(context: CGContext)
     {
         fatalError("renderAxisLabels() cannot be called on AxisRendererBase")
     }
     
     /// Draws the grid lines belonging to the axis.
-    open func renderGridLines(context: CGContext)
+    @objc open func renderGridLines(context: CGContext)
     {
         fatalError("renderGridLines() cannot be called on AxisRendererBase")
     }
     
     /// Draws the line that goes alongside the axis.
-    open func renderAxisLine(context: CGContext)
+    @objc open func renderAxisLine(context: CGContext)
     {
         fatalError("renderAxisLine() cannot be called on AxisRendererBase")
     }
     
     /// Draws the LimitLines associated with this axis to the screen.
-    open func renderLimitLines(context: CGContext)
+    @objc open func renderLimitLines(context: CGContext)
     {
         fatalError("renderLimitLines() cannot be called on AxisRendererBase")
     }
     
     /// Computes the axis values.
-    /// - parameter min: the minimum value in the data object for this axis
-    /// - parameter max: the maximum value in the data object for this axis
-    open func computeAxis(min: Double, max: Double, inverted: Bool)
+    ///
+    /// - Parameters:
+    ///   - min: the minimum value in the data object for this axis
+    ///   - max: the maximum value in the data object for this axis
+    @objc open func computeAxis(min: Double, max: Double, inverted: Bool)
     {
         var min = min, max = max
         
         if let transformer = self.transformer
         {
             // calculate the starting and entry point of the y-labels (depending on zoom / contentrect bounds)
-            if let viewPortHandler = viewPortHandler
+            if viewPortHandler.contentWidth > 10.0 && !viewPortHandler.isFullyZoomedOutY
             {
-                if viewPortHandler.contentWidth > 10.0 && !viewPortHandler.isFullyZoomedOutY
+                let p1 = transformer.valueForTouchPoint(CGPoint(x: viewPortHandler.contentLeft, y: viewPortHandler.contentTop))
+                let p2 = transformer.valueForTouchPoint(CGPoint(x: viewPortHandler.contentLeft, y: viewPortHandler.contentBottom))
+                
+                if !inverted
                 {
-                    let p1 = transformer.valueForTouchPoint(CGPoint(x: viewPortHandler.contentLeft, y: viewPortHandler.contentTop))
-                    let p2 = transformer.valueForTouchPoint(CGPoint(x: viewPortHandler.contentLeft, y: viewPortHandler.contentBottom))
-                    
-                    if !inverted
-                    {
-                        min = Double(p2.y)
-                        max = Double(p1.y)
-                    }
-                    else
-                    {
-                        min = Double(p1.y)
-                        max = Double(p2.y)
-                    }
+                    min = Double(p2.y)
+                    max = Double(p1.y)
+                }
+                else
+                {
+                    min = Double(p1.y)
+                    max = Double(p2.y)
                 }
             }
         }
@@ -93,7 +87,7 @@ open class AxisRendererBase: Renderer
     }
     
     /// Sets up the axis values. Computes the desired number of labels between the two given extremes.
-    open func computeAxisValues(min: Double, max: Double)
+    @objc open func computeAxisValues(min: Double, max: Double)
     {
         guard let axis = self.axis else { return }
         
@@ -112,7 +106,7 @@ open class AxisRendererBase: Renderer
         
         // Find out how much spacing (in y value space) between axis values
         let rawInterval = range / Double(labelCount)
-        var interval = ChartUtils.roundToNextSignificant(number: Double(rawInterval))
+        var interval = rawInterval.roundedToNextSignficant()
         
         // If granularity is enabled, then do not allow the interval to go below specified granularity.
         // This is used to avoid repeated values when rounding values for display.
@@ -122,12 +116,13 @@ open class AxisRendererBase: Renderer
         }
         
         // Normalize interval
-        let intervalMagnitude = ChartUtils.roundToNextSignificant(number: pow(10.0, Double(Int(log10(interval)))))
+        let intervalMagnitude = pow(10.0, Double(Int(log10(interval)))).roundedToNextSignficant()
         let intervalSigDigit = Int(interval / intervalMagnitude)
         if intervalSigDigit > 5
         {
             // Use one order of magnitude higher, to avoid intervals like 0.9 or 90
-            interval = floor(10.0 * Double(intervalMagnitude))
+            // if it's 0.0 after floor(), we use the old value
+            interval = floor(10.0 * intervalMagnitude) == 0.0 ? interval : floor(10.0 * intervalMagnitude)
         }
         
         var n = axis.centerAxisLabelsEnabled ? 1 : 0
@@ -162,7 +157,7 @@ open class AxisRendererBase: Renderer
                 first -= interval
             }
             
-            let last = interval == 0.0 ? 0.0 : ChartUtils.nextUp(floor(yMax / interval) * interval)
+            let last = interval == 0.0 ? 0.0 : (floor(yMax / interval) * interval).nextUp
             
             if interval != 0.0 && last != first
             {
@@ -171,7 +166,11 @@ open class AxisRendererBase: Renderer
                     n += 1
                 }
             }
-            
+            else if last == first && n == 0
+            {
+                n = 1
+            }
+
             // Ensure stops contains at least n elements.
             axis.entries.removeAll(keepingCapacity: true)
             axis.entries.reserveCapacity(labelCount)
diff --git a/Source/Charts/Renderers/BarChartRenderer.swift b/Source/Charts/Renderers/BarChartRenderer.swift
index c1b6d73dbc..c2ff0b108b 100644
--- a/Source/Charts/Renderers/BarChartRenderer.swift
+++ b/Source/Charts/Renderers/BarChartRenderer.swift
@@ -12,20 +12,46 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
 {
-    fileprivate class Buffer
+    /// A nested array of elements ordered logically (i.e not in visual/drawing order) for use with VoiceOver
+    ///
+    /// Its use is apparent when there are multiple data sets, since we want to read bars in left to right order,
+    /// irrespective of dataset. However, drawing is done per dataset, so using this array and then flattening it prevents us from needing to
+    /// re-render for the sake of accessibility.
+    ///
+    /// In practise, its structure is:
+    ///
+    /// ````
+    ///     [
+    ///      [dataset1 element1, dataset2 element1],
+    ///      [dataset1 element2, dataset2 element2],
+    ///      [dataset1 element3, dataset2 element3]
+    ///     ...
+    ///     ]
+    /// ````
+    /// This is done to provide numerical inference across datasets to a screenreader user, in the same way that a sighted individual
+    /// uses a multi-dataset bar chart.
+    ///
+    /// The ````internal```` specifier is to allow subclasses (HorizontalBar) to populate the same array
+    internal lazy var accessibilityOrderedElements: [[NSUIAccessibilityElement]] = accessibilityCreateEmptyOrderedElements()
+
+    private class Buffer
     {
         var rects = [CGRect]()
     }
     
-    open weak var dataProvider: BarChartDataProvider?
+    @objc open weak var dataProvider: BarChartDataProvider?
     
-    public init(dataProvider: BarChartDataProvider?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc public init(dataProvider: BarChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
         
@@ -33,7 +59,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
     }
     
     // [CGRect] per dataset
-    fileprivate var _buffers = [Buffer]()
+    private var _buffers = [Buffer]()
     
     open override func initBuffers()
     {
@@ -68,12 +94,11 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         }
     }
     
-    fileprivate func prepareBuffer(dataSet: IBarChartDataSet, index: Int)
+    private func prepareBuffer(dataSet: IBarChartDataSet, index: Int)
     {
         guard
             let dataProvider = dataProvider,
-            let barData = dataProvider.barData,
-            let animator = animator
+            let barData = dataProvider.barData
             else { return }
         
         let barWidthHalf = barData.barWidth / 2.0
@@ -87,16 +112,17 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         var barRect = CGRect()
         var x: Double
         var y: Double
+
         
         for i in stride(from: 0, to: min(Int(ceil(Double(dataSet.entryCount) * animator.phaseX)), dataSet.entryCount), by: 1)
         {
             guard let e = dataSet.entryForIndex(i) as? BarChartDataEntry else { continue }
             
             let vals = e.yValues
-            
+
             x = e.x
             y = e.y
-            
+
             if !containsStacks || vals == nil
             {
                 let left = CGFloat(x - barWidthHalf)
@@ -108,8 +134,83 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                     ? (y >= 0.0 ? CGFloat(y) : 0)
                     : (y <= 0.0 ? CGFloat(y) : 0)
                 
+                /* When drawing each bar, the renderer actually draws each bar from 0 to the required value.
+                 * This drawn bar is then clipped to the visible chart rect in BarLineChartViewBase's draw(rect:) using clipDataToContent.
+                 * While this works fine when calculating the bar rects for drawing, it causes the accessibilityFrames to be oversized in some cases.
+                 * This offset attempts to undo that unnecessary drawing when calculating barRects
+                 *
+                 * +---------------------------------------------------------------+---------------------------------------------------------------+
+                 * |      Situation 1:  (!inverted && y >= 0)                      |      Situation 3:  (inverted && y >= 0)                       |
+                 * |                                                               |                                                               |
+                 * |        y ->           +--+       <- top                       |        0 -> ---+--+---+--+------   <- top                     |
+                 * |                       |//|        } topOffset = y - max       |                |  |   |//|          } topOffset = min         |
+                 * |      max -> +---------+--+----+  <- top - topOffset           |      min -> +--+--+---+--+----+    <- top + topOffset         |
+                 * |             |  +--+   |//|    |                               |             |  |  |   |//|    |                               |
+                 * |             |  |  |   |//|    |                               |             |  +--+   |//|    |                               |
+                 * |             |  |  |   |//|    |                               |             |         |//|    |                               |
+                 * |      min -> +--+--+---+--+----+  <- bottom + bottomOffset     |      max -> +---------+--+----+    <- bottom - bottomOffset   |
+                 * |                |  |   |//|        } bottomOffset = min        |                       |//|          } bottomOffset = y - max  |
+                 * |        0 -> ---+--+---+--+-----  <- bottom                    |        y ->           +--+         <- bottom                  |
+                 * |                                                               |                                                               |
+                 * +---------------------------------------------------------------+---------------------------------------------------------------+
+                 * |      Situation 2:  (!inverted && y < 0)                       |      Situation 4:  (inverted && y < 0)                        |
+                 * |                                                               |                                                               |
+                 * |        0 -> ---+--+---+--+-----   <- top                      |        y ->           +--+         <- top                     |
+                 * |                |  |   |//|         } topOffset = -max         |                       |//|          } topOffset = min - y     |
+                 * |      max -> +--+--+---+--+----+   <- top - topOffset          |      min -> +---------+--+----+    <- top + topOffset         |
+                 * |             |  |  |   |//|    |                               |             |  +--+   |//|    |                               |
+                 * |             |  +--+   |//|    |                               |             |  |  |   |//|    |                               |
+                 * |             |         |//|    |                               |             |  |  |   |//|    |                               |
+                 * |      min -> +---------+--+----+   <- bottom + bottomOffset    |      max -> +--+--+---+--+----+    <- bottom - bottomOffset   |
+                 * |                       |//|         } bottomOffset = min - y   |                |  |   |//|          } bottomOffset = -max     |
+                 * |        y ->           +--+        <- bottom                   |        0 -> ---+--+---+--+-------  <- bottom                  |
+                 * |                                                               |                                                               |
+                 * +---------------------------------------------------------------+---------------------------------------------------------------+
+                 */
+                var topOffset: CGFloat = 0.0
+                var bottomOffset: CGFloat = 0.0
+                if let offsetView = dataProvider as? BarChartView
+                {
+                    let offsetAxis = offsetView.getAxis(dataSet.axisDependency)
+                    if y >= 0
+                    {
+                        // situation 1
+                        if offsetAxis.axisMaximum < y
+                        {
+                            topOffset = CGFloat(y - offsetAxis.axisMaximum)
+                        }
+                        if offsetAxis.axisMinimum > 0
+                        {
+                            bottomOffset = CGFloat(offsetAxis.axisMinimum)
+                        }
+                    }
+                    else // y < 0
+                    {
+                        //situation 2
+                        if offsetAxis.axisMaximum < 0
+                        {
+                            topOffset = CGFloat(offsetAxis.axisMaximum * -1)
+                        }
+                        if offsetAxis.axisMinimum > y
+                        {
+                            bottomOffset = CGFloat(offsetAxis.axisMinimum - y)
+                        }
+                    }
+                    if isInverted
+                    {
+                        // situation 3 and 4
+                        // exchange topOffset/bottomOffset based on 1 and 2
+                        // see diagram above
+                        (topOffset, bottomOffset) = (bottomOffset, topOffset)
+                    }
+                }
+                //apply offset
+                top = isInverted ? top + topOffset : top - topOffset
+                bottom = isInverted ? bottom - bottomOffset : bottom + bottomOffset
+
                 // multiply the height of the rect with the phase
-                if top > 0
+                // explicitly add 0 + topOffset to indicate this is changed after adding accessibility support (#3650, #3520)
+                if top > 0 + topOffset
                 {
                     top *= CGFloat(phaseY)
                 }
@@ -117,12 +218,11 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 {
                     bottom *= CGFloat(phaseY)
                 }
-                
+
                 barRect.origin.x = left
-                barRect.size.width = right - left
                 barRect.origin.y = top
+                barRect.size.width = right - left
                 barRect.size.height = bottom - top
-                
                 buffer.rects[bufferIndex] = barRect
                 bufferIndex += 1
             }
@@ -180,7 +280,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
             }
         }
     }
-    
+
     open override func drawData(context: CGContext)
     {
         guard
@@ -188,6 +288,19 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
             let barData = dataProvider.barData
             else { return }
         
+        // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+        accessibleChartElements.removeAll()
+        accessibilityOrderedElements = accessibilityCreateEmptyOrderedElements()
+
+        // Make the chart header the first element in the accessible elements array
+        if let chart = dataProvider as? BarChartView {
+            let element = createAccessibleHeader(usingChart: chart,
+                                                 andData: barData,
+                                                 withDefaultDescription: "Bar Chart")
+            accessibleChartElements.append(element)
+        }
+
+        // Populate logically ordered nested elements into accessibilityOrderedElements in drawDataSet()
         for i in 0 ..< barData.dataSetCount
         {
             guard let set = barData.getDataSetByIndex(i) else { continue }
@@ -202,22 +315,23 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 drawDataSet(context: context, dataSet: set as! IBarChartDataSet, index: i)
             }
         }
+
+        // Merge nested ordered arrays into the single accessibleChartElements.
+        accessibleChartElements.append(contentsOf: accessibilityOrderedElements.flatMap { $0 } )
+        accessibilityPostLayoutChangedNotification()
     }
-    
-    fileprivate var _barShadowRectBuffer: CGRect = CGRect()
-    
-    open func drawDataSet(context: CGContext, dataSet: IBarChartDataSet, index: Int)
+
+    private var _barShadowRectBuffer: CGRect = CGRect()
+
+    @objc open func drawDataSet(context: CGContext, dataSet: IBarChartDataSet, index: Int)
     {
-        guard
-            let dataProvider = dataProvider,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
-        
+        guard let dataProvider = dataProvider else { return }
+
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
-        
+
         prepareBuffer(dataSet: dataSet, index: index)
         trans.rectValuesToPixel(&_buffers[index].rects)
-        
+
         let borderWidth = dataSet.barBorderWidth
         let borderColor = dataSet.barBorderColor
         let drawBorder = borderWidth > 0.0
@@ -227,10 +341,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         // draw the bar shadow before the values
         if dataProvider.isDrawBarShadowEnabled
         {
-            guard
-                let animator = animator,
-                let barData = dataProvider.barData
-                else { return }
+            guard let barData = dataProvider.barData else { return }
             
             let barWidth = barData.barWidth
             let barWidthHalf = barWidth / 2.0
@@ -264,7 +375,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 context.fill(_barShadowRectBuffer)
             }
         }
-        
+
         let buffer = _buffers[index]
         
         // draw the bar shadow before the values
@@ -295,11 +406,15 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         {
             context.setFillColor(dataSet.color(atIndex: 0).cgColor)
         }
-        
+
+        // In case the chart is stacked, we need to accomodate individual bars within accessibilityOrdereredElements
+        let isStacked = dataSet.isStacked
+        let stackSize = isStacked ? dataSet.stackSize : 1
+
         for j in stride(from: 0, to: buffer.rects.count, by: 1)
         {
             let barRect = buffer.rects[j]
-            
+
             if (!viewPortHandler.isInBoundsLeft(barRect.origin.x + barRect.size.width))
             {
                 continue
@@ -324,6 +439,21 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
                 context.setLineWidth(borderWidth)
                 context.stroke(barRect)
             }
+
+            // Create and append the corresponding accessibility element to accessibilityOrderedElements
+            if let chart = dataProvider as? BarChartView
+            {
+                let element = createAccessibleElement(withIndex: j,
+                                                      container: chart,
+                                                      dataSet: dataSet,
+                                                      dataSetIndex: index,
+                                                      stackSize: stackSize)
+                { (element) in
+                    element.accessibilityFrame = barRect
+                }
+
+                accessibilityOrderedElements[j/stackSize].append(element)
+            }
         }
         
         context.restoreGState()
@@ -347,7 +477,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         rect.size.width = CGFloat(right - left)
         rect.size.height = CGFloat(bottom - top)
         
-        trans.rectValueToPixel(&rect, phaseY: animator?.phaseY ?? 1.0)
+        trans.rectValueToPixel(&rect, phaseY: animator.phaseY )
     }
 
     open override func drawValues(context: CGContext)
@@ -357,12 +487,10 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         {
             guard
                 let dataProvider = dataProvider,
-                let viewPortHandler = self.viewPortHandler,
-                let barData = dataProvider.barData,
-                let animator = animator
+                let barData = dataProvider.barData
                 else { return }
-            
-            var dataSets = barData.dataSets
+
+            let dataSets = barData.dataSets
 
             let valueOffsetPlus: CGFloat = 4.5
             var posOffset: CGFloat
@@ -371,12 +499,10 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
             
             for dataSetIndex in 0 ..< barData.dataSetCount
             {
-                guard let dataSet = dataSets[dataSetIndex] as? IBarChartDataSet else { continue }
-                
-                if !shouldDrawValues(forDataSet: dataSet)
-                {
-                    continue
-                }
+                guard let
+                    dataSet = dataSets[dataSetIndex] as? IBarChartDataSet,
+                    shouldDrawValues(forDataSet: dataSet)
+                    else { continue }
                 
                 let isInverted = dataProvider.isInverted(axis: dataSet.axisDependency)
                 
@@ -615,9 +741,9 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
     }
     
     /// Draws a value at the specified x and y position.
-    open func drawValue(context: CGContext, value: String, xPos: CGFloat, yPos: CGFloat, font: NSUIFont, align: NSTextAlignment, color: NSUIColor)
+    @objc open func drawValue(context: CGContext, value: String, xPos: CGFloat, yPos: CGFloat, font: NSUIFont, align: NSTextAlignment, color: NSUIColor)
     {
-        ChartUtils.drawText(context: context, text: value, point: CGPoint(x: xPos, y: yPos), align: align, attributes: [NSFontAttributeName: font, NSForegroundColorAttributeName: color])
+        ChartUtils.drawText(context: context, text: value, point: CGPoint(x: xPos, y: yPos), align: align, attributes: [NSAttributedString.Key.font: font, NSAttributedString.Key.foregroundColor: color])
     }
     
     open override func drawExtras(context: CGContext)
@@ -691,10 +817,88 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
         
         context.restoreGState()
     }
-    
-    /// Sets the drawing position of the highlight object based on the riven bar-rect.
+
+    /// Sets the drawing position of the highlight object based on the given bar-rect.
     internal func setHighlightDrawPos(highlight high: Highlight, barRect: CGRect)
     {
         high.setDraw(x: barRect.midX, y: barRect.origin.y)
     }
+
+    /// Creates a nested array of empty subarrays each of which will be populated with NSUIAccessibilityElements.
+    /// This is marked internal to support HorizontalBarChartRenderer as well.
+    internal func accessibilityCreateEmptyOrderedElements() -> [[NSUIAccessibilityElement]]
+    {
+        guard let chart = dataProvider as? BarChartView else { return [] }
+
+        // Unlike Bubble & Line charts, here we use the maximum entry count to account for stacked bars
+        let maxEntryCount = chart.data?.maxEntryCountSet?.entryCount ?? 0
+
+        return Array(repeating: [NSUIAccessibilityElement](),
+                     count: maxEntryCount)
+    }
+
+    /// Creates an NSUIAccessibleElement representing the smallest meaningful bar of the chart
+    /// i.e. in case of a stacked chart, this returns each stack, not the combined bar.
+    /// Note that it is marked internal to support subclass modification in the HorizontalBarChart.
+    internal func createAccessibleElement(withIndex idx: Int,
+                                          container: BarChartView,
+                                          dataSet: IBarChartDataSet,
+                                          dataSetIndex: Int,
+                                          stackSize: Int,
+                                          modifier: (NSUIAccessibilityElement) -> ()) -> NSUIAccessibilityElement
+    {
+        let element = NSUIAccessibilityElement(accessibilityContainer: container)
+        let xAxis = container.xAxis
+
+        guard let e = dataSet.entryForIndex(idx/stackSize) as? BarChartDataEntry else { return element }
+        guard let dataProvider = dataProvider else { return element }
+
+        // NOTE: The formatter can cause issues when the x-axis labels are consecutive ints.
+        // i.e. due to the Double conversion, if there are more than one data set that are grouped,
+        // there is the possibility of some labels being rounded up. A floor() might fix this, but seems to be a brute force solution.
+        let label = xAxis.valueFormatter?.stringForValue(e.x, axis: xAxis) ?? "\(e.x)"
+
+        var elementValueText = dataSet.valueFormatter?.stringForValue(
+            e.y,
+            entry: e,
+            dataSetIndex: dataSetIndex,
+            viewPortHandler: viewPortHandler) ?? "\(e.y)"
+
+        if dataSet.isStacked, let vals = e.yValues
+        {
+            let labelCount = min(dataSet.colors.count, stackSize)
+
+            let stackLabel: String?
+            if (dataSet.stackLabels.count > 0 && labelCount > 0) {
+                let labelIndex = idx % labelCount
+                stackLabel = dataSet.stackLabels.indices.contains(labelIndex) ? dataSet.stackLabels[labelIndex] : nil
+            } else {
+                stackLabel = nil
+            }
+            
+            //Handles empty array of yValues
+            let yValue = vals.isEmpty ? 0.0 : vals[idx % vals.count]
+            
+            elementValueText = dataSet.valueFormatter?.stringForValue(
+                yValue,
+                entry: e,
+                dataSetIndex: dataSetIndex,
+                viewPortHandler: viewPortHandler) ?? "\(e.y)"
+
+            if let stackLabel = stackLabel {
+                elementValueText = stackLabel + " \(elementValueText)"
+            } else {
+                elementValueText = "\(elementValueText)"
+            }
+        }
+
+        let dataSetCount = dataProvider.barData?.dataSetCount ?? -1
+        let doesContainMultipleDataSets = dataSetCount > 1
+
+        element.accessibilityLabel = "\(doesContainMultipleDataSets ? (dataSet.label ?? "")  + ", " : "") \(label): \(elementValueText)"
+
+        modifier(element)
+
+        return element
+    }
 }
diff --git a/Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift b/Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift
index a70111771a..82e6df9c88 100644
--- a/Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift
+++ b/Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift
@@ -17,7 +17,7 @@ open class BarLineScatterCandleBubbleRenderer: DataRenderer
 {
     internal var _xBounds = XBounds() // Reusable XBounds object
     
-    public override init(animator: Animator?, viewPortHandler: ViewPortHandler?)
+    public override init(animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
     }
@@ -26,15 +26,7 @@ open class BarLineScatterCandleBubbleRenderer: DataRenderer
     internal func isInBoundsX(entry e: ChartDataEntry, dataSet: IBarLineScatterCandleBubbleChartDataSet) -> Bool
     {
         let entryIndex = dataSet.entryIndex(entry: e)
-        
-        if Double(entryIndex) >= Double(dataSet.entryCount) * (animator?.phaseX ?? 1.0)
-        {
-            return false
-        }
-        else
-        {
-            return true
-        }
+        return Double(entryIndex) < Double(dataSet.entryCount) * animator.phaseX
     }
 
     /// Calculates and returns the x-bounds for the given DataSet in terms of index in their values array.
@@ -46,7 +38,7 @@ open class BarLineScatterCandleBubbleRenderer: DataRenderer
         return XBounds(chart: chart, dataSet: dataSet, animator: animator)
     }
     
-    /// - returns: `true` if the DataSet values should be drawn, `false` if not.
+    /// - Returns: `true` if the DataSet values should be drawn, `false` if not.
     internal func shouldDrawValues(forDataSet set: IChartDataSet) -> Bool
     {
         return set.isVisible && (set.isDrawValuesEnabled || set.isDrawIconsEnabled)
@@ -86,13 +78,50 @@ open class BarLineScatterCandleBubbleRenderer: DataRenderer
             let low = chart.lowestVisibleX
             let high = chart.highestVisibleX
             
-            let entryFrom = dataSet.entryForXValue(low, closestToY: Double.nan, rounding: ChartDataSetRounding.down)
-            let entryTo = dataSet.entryForXValue(high, closestToY: Double.nan, rounding: ChartDataSetRounding.up)
+            let entryFrom = dataSet.entryForXValue(low, closestToY: .nan, rounding: .down)
+            let entryTo = dataSet.entryForXValue(high, closestToY: .nan, rounding: .up)
             
             self.min = entryFrom == nil ? 0 : dataSet.entryIndex(entry: entryFrom!)
             self.max = entryTo == nil ? 0 : dataSet.entryIndex(entry: entryTo!)
             range = Int(Double(self.max - self.min) * phaseX)
         }
     }
+}
+
+extension BarLineScatterCandleBubbleRenderer.XBounds: RangeExpression {
+    public func relative<C>(to collection: C) -> Swift.Range<Int>
+        where C : Collection, Bound == C.Index
+    {
+        return Swift.Range<Int>(min...min + range)
+    }
+
+    public func contains(_ element: Int) -> Bool {
+        return (min...min + range).contains(element)
+    }
+}
+
+extension BarLineScatterCandleBubbleRenderer.XBounds: Sequence {
+    public struct Iterator: IteratorProtocol {
+        private var iterator: IndexingIterator<ClosedRange<Int>>
+        
+        fileprivate init(min: Int, max: Int) {
+            self.iterator = (min...max).makeIterator()
+        }
+        
+        public mutating func next() -> Int? {
+            return self.iterator.next()
+        }
+    }
+    
+    public func makeIterator() -> Iterator {
+        return Iterator(min: self.min, max: self.min + self.range)
+    }
+}
 
+extension BarLineScatterCandleBubbleRenderer.XBounds: CustomDebugStringConvertible
+{
+    public var debugDescription: String
+    {
+        return "min:\(self.min), max:\(self.max), range:\(self.range)"
+    }
 }
diff --git a/Source/Charts/Renderers/BubbleChartRenderer.swift b/Source/Charts/Renderers/BubbleChartRenderer.swift
index 7950422a4f..1a089e9f3e 100644
--- a/Source/Charts/Renderers/BubbleChartRenderer.swift
+++ b/Source/Charts/Renderers/BubbleChartRenderer.swift
@@ -12,16 +12,14 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
-
 open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
 {
-    open weak var dataProvider: BubbleChartDataProvider?
+    /// A nested array of elements ordered logically (i.e not in visual/drawing order) for use with VoiceOver.
+    private lazy var accessibilityOrderedElements: [[NSUIAccessibilityElement]] = accessibilityCreateEmptyOrderedElements()
+
+    @objc open weak var dataProvider: BubbleChartDataProvider?
     
-    public init(dataProvider: BubbleChartDataProvider?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc public init(dataProvider: BubbleChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
         
@@ -35,16 +33,29 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
             let bubbleData = dataProvider.bubbleData
             else { return }
         
-        for set in bubbleData.dataSets as! [IBubbleChartDataSet]
+        // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+        accessibleChartElements.removeAll()
+        accessibilityOrderedElements = accessibilityCreateEmptyOrderedElements()
+
+        // Make the chart header the first element in the accessible elements array
+        if let chart = dataProvider as? BubbleChartView {
+            let element = createAccessibleHeader(usingChart: chart,
+                                                 andData: bubbleData,
+                                                 withDefaultDescription: "Bubble Chart")
+            accessibleChartElements.append(element)
+        }
+
+        for (i, set) in (bubbleData.dataSets as! [IBubbleChartDataSet]).enumerated() where set.isVisible
         {
-            if set.isVisible
-            {
-                drawDataSet(context: context, dataSet: set)
-            }
+            drawDataSet(context: context, dataSet: set, dataSetIndex: i)
         }
+
+        // Merge nested ordered arrays into the single accessibleChartElements.
+        accessibleChartElements.append(contentsOf: accessibilityOrderedElements.flatMap { $0 } )
+        accessibilityPostLayoutChangedNotification()
     }
     
-    fileprivate func getShapeSize(
+    private func getShapeSize(
         entrySize: CGFloat,
         maxSize: CGFloat,
         reference: CGFloat,
@@ -57,16 +68,12 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
         return shapeSize
     }
     
-    fileprivate var _pointBuffer = CGPoint()
-    fileprivate var _sizeBuffer = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _pointBuffer = CGPoint()
+    private var _sizeBuffer = [CGPoint](repeating: CGPoint(), count: 2)
     
-    open func drawDataSet(context: CGContext, dataSet: IBubbleChartDataSet)
+    @objc open func drawDataSet(context: CGContext, dataSet: IBubbleChartDataSet, dataSetIndex: Int)
     {
-        guard
-            let dataProvider = dataProvider,
-            let viewPortHandler = self.viewPortHandler,
-            let animator = animator
-            else { return }
+        guard let dataProvider = dataProvider else { return }
         
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
         
@@ -84,6 +91,7 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
         trans.pointValuesToPixel(&_sizeBuffer)
         
         context.saveGState()
+        defer { context.restoreGState() }
         
         let normalizeSize = dataSet.isNormalizeSizeEnabled
         
@@ -92,7 +100,7 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
         let maxBubbleHeight: CGFloat = abs(viewPortHandler.contentBottom - viewPortHandler.contentTop)
         let referenceSize: CGFloat = min(maxBubbleHeight, maxBubbleWidth)
         
-        for j in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
+        for j in _xBounds
         {
             guard let entry = dataSet.entryForIndex(j) as? BubbleChartDataEntry else { continue }
             
@@ -103,23 +111,15 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
             let shapeSize = getShapeSize(entrySize: entry.size, maxSize: dataSet.maxSize, reference: referenceSize, normalizeSize: normalizeSize)
             let shapeHalf = shapeSize / 2.0
             
-            if !viewPortHandler.isInBoundsTop(_pointBuffer.y + shapeHalf)
-                || !viewPortHandler.isInBoundsBottom(_pointBuffer.y - shapeHalf)
-            {
-                continue
-            }
-            
-            if !viewPortHandler.isInBoundsLeft(_pointBuffer.x + shapeHalf)
-            {
-                continue
-            }
-            
-            if !viewPortHandler.isInBoundsRight(_pointBuffer.x - shapeHalf)
-            {
-                break
-            }
+            guard
+                viewPortHandler.isInBoundsTop(_pointBuffer.y + shapeHalf),
+                viewPortHandler.isInBoundsBottom(_pointBuffer.y - shapeHalf),
+                viewPortHandler.isInBoundsLeft(_pointBuffer.x + shapeHalf)
+                else { continue }
+
+            guard viewPortHandler.isInBoundsRight(_pointBuffer.x - shapeHalf) else { break }
             
-            let color = dataSet.color(atIndex: Int(entry.x))
+            let color = dataSet.color(atIndex: j)
             
             let rect = CGRect(
                 x: _pointBuffer.x - shapeHalf,
@@ -130,101 +130,102 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
 
             context.setFillColor(color.cgColor)
             context.fillEllipse(in: rect)
+
+            // Create and append the corresponding accessibility element to accessibilityOrderedElements
+            if let chart = dataProvider as? BubbleChartView
+            {
+                let element = createAccessibleElement(withIndex: j,
+                                                      container: chart,
+                                                      dataSet: dataSet,
+                                                      dataSetIndex: dataSetIndex,
+                                                      shapeSize: shapeSize)
+                { (element) in
+                    element.accessibilityFrame = rect
+                }
+
+                accessibilityOrderedElements[dataSetIndex].append(element)
+            }
         }
-        
-        context.restoreGState()
     }
     
     open override func drawValues(context: CGContext)
     {
         guard let
             dataProvider = dataProvider,
-            let viewPortHandler = self.viewPortHandler,
             let bubbleData = dataProvider.bubbleData,
-            let animator = animator
+            isDrawingValuesAllowed(dataProvider: dataProvider),
+            let dataSets = bubbleData.dataSets as? [IBubbleChartDataSet]
             else { return }
-        
-        // if values are drawn
-        if isDrawingValuesAllowed(dataProvider: dataProvider)
+
+        let phaseX = max(0.0, min(1.0, animator.phaseX))
+        let phaseY = animator.phaseY
+
+        var pt = CGPoint()
+
+        for i in 0..<dataSets.count
         {
-            guard let dataSets = bubbleData.dataSets as? [IBubbleChartDataSet] else { return }
-            
-            let phaseX = max(0.0, min(1.0, animator.phaseX))
-            let phaseY = animator.phaseY
-            
-            var pt = CGPoint()
-            
-            for i in 0..<dataSets.count
+            let dataSet = dataSets[i]
+
+            guard
+                shouldDrawValues(forDataSet: dataSet),
+                let formatter = dataSet.valueFormatter
+                else { continue }
+
+            let alpha = phaseX == 1 ? phaseY : phaseX
+
+            _xBounds.set(chart: dataProvider, dataSet: dataSet, animator: animator)
+
+            let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
+            let valueToPixelMatrix = trans.valueToPixelMatrix
+
+            let iconsOffset = dataSet.iconsOffset
+
+            for j in _xBounds
             {
-                let dataSet = dataSets[i]
-                
-                if !shouldDrawValues(forDataSet: dataSet)
+                guard let e = dataSet.entryForIndex(j) as? BubbleChartDataEntry else { break }
+
+                let valueTextColor = dataSet.valueTextColorAt(j).withAlphaComponent(CGFloat(alpha))
+
+                pt.x = CGFloat(e.x)
+                pt.y = CGFloat(e.y * phaseY)
+                pt = pt.applying(valueToPixelMatrix)
+
+                guard viewPortHandler.isInBoundsRight(pt.x) else { break }
+
+                guard
+                    viewPortHandler.isInBoundsLeft(pt.x),
+                    viewPortHandler.isInBoundsY(pt.y)
+                    else { continue }
+
+                let text = formatter.stringForValue(
+                    Double(e.size),
+                    entry: e,
+                    dataSetIndex: i,
+                    viewPortHandler: viewPortHandler)
+
+                // Larger font for larger bubbles?
+                let valueFont = dataSet.valueFont
+                let lineHeight = valueFont.lineHeight
+
+                if dataSet.isDrawValuesEnabled
                 {
-                    continue
+                    ChartUtils.drawText(
+                        context: context,
+                        text: text,
+                        point: CGPoint(
+                            x: pt.x,
+                            y: pt.y - (0.5 * lineHeight)),
+                        align: .center,
+                        attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: valueTextColor])
                 }
-                
-                let alpha = phaseX == 1 ? phaseY : phaseX
-                
-                guard let formatter = dataSet.valueFormatter else { continue }
-                
-                _xBounds.set(chart: dataProvider, dataSet: dataSet, animator: animator)
-                
-                let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
-                let valueToPixelMatrix = trans.valueToPixelMatrix
-                
-                let iconsOffset = dataSet.iconsOffset
-                
-                for j in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
+
+                if let icon = e.icon, dataSet.isDrawIconsEnabled
                 {
-                    guard let e = dataSet.entryForIndex(j) as? BubbleChartDataEntry else { break }
-                    
-                    let valueTextColor = dataSet.valueTextColorAt(j).withAlphaComponent(CGFloat(alpha))
-                    
-                    pt.x = CGFloat(e.x)
-                    pt.y = CGFloat(e.y * phaseY)
-                    pt = pt.applying(valueToPixelMatrix)
-                    
-                    if (!viewPortHandler.isInBoundsRight(pt.x))
-                    {
-                        break
-                    }
-                    
-                    if ((!viewPortHandler.isInBoundsLeft(pt.x) || !viewPortHandler.isInBoundsY(pt.y)))
-                    {
-                        continue
-                    }
-                    
-                    let text = formatter.stringForValue(
-                        Double(e.size),
-                        entry: e,
-                        dataSetIndex: i,
-                        viewPortHandler: viewPortHandler)
-                    
-                    // Larger font for larger bubbles?
-                    let valueFont = dataSet.valueFont
-                    let lineHeight = valueFont.lineHeight
-
-                    if dataSet.isDrawValuesEnabled
-                    {
-                        ChartUtils.drawText(
-                            context: context,
-                            text: text,
-                            point: CGPoint(
-                                x: pt.x,
-                                y: pt.y - (0.5 * lineHeight)),
-                            align: .center,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor])
-                    }
-                    
-                    if let icon = e.icon, dataSet.isDrawIconsEnabled
-                    {
-                         ChartUtils.drawImage(context: context,
-                                              image: icon,
-                                              x: pt.x + iconsOffset.x,
-                                              y: pt.y + iconsOffset.y,
-                                              size: icon.size)
-                    }
-                    
+                    ChartUtils.drawImage(context: context,
+                                         image: icon,
+                                         x: pt.x + iconsOffset.x,
+                                         y: pt.y + iconsOffset.y,
+                                         size: icon.size)
                 }
             }
         }
@@ -237,28 +238,25 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
     
     open override func drawHighlighted(context: CGContext, indices: [Highlight])
     {
-        guard let
-            dataProvider = dataProvider,
-            let viewPortHandler = self.viewPortHandler,
-            let bubbleData = dataProvider.bubbleData,
-            let animator = animator
+        guard
+            let dataProvider = dataProvider,
+            let bubbleData = dataProvider.bubbleData
             else { return }
-        
+
         context.saveGState()
-        
+        defer { context.restoreGState() }
+
         let phaseY = animator.phaseY
         
         for high in indices
         {
             guard
                 let dataSet = bubbleData.getDataSetByIndex(high.dataSetIndex) as? IBubbleChartDataSet,
-                dataSet.isHighlightEnabled
+                dataSet.isHighlightEnabled,
+                let entry = dataSet.entryForXValue(high.x, closestToY: high.y) as? BubbleChartDataEntry,
+                isInBoundsX(entry: entry, dataSet: dataSet)
                 else { continue }
-                        
-            guard let entry = dataSet.entryForXValue(high.x, closestToY: high.y) as? BubbleChartDataEntry else { continue }
-            
-            if !isInBoundsX(entry: entry, dataSet: dataSet) { continue }
-            
+
             let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
             
             _sizeBuffer[0].x = 0.0
@@ -282,22 +280,14 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
             let shapeSize = getShapeSize(entrySize: entry.size, maxSize: dataSet.maxSize, reference: referenceSize, normalizeSize: normalizeSize)
             let shapeHalf = shapeSize / 2.0
             
-            if !viewPortHandler.isInBoundsTop(_pointBuffer.y + shapeHalf) ||
-                !viewPortHandler.isInBoundsBottom(_pointBuffer.y - shapeHalf)
-            {
-                continue
-            }
-            
-            if !viewPortHandler.isInBoundsLeft(_pointBuffer.x + shapeHalf)
-            {
-                continue
-            }
-            
-            if !viewPortHandler.isInBoundsRight(_pointBuffer.x - shapeHalf)
-            {
-                break
-            }
-            
+            guard
+                viewPortHandler.isInBoundsTop(_pointBuffer.y + shapeHalf),
+                viewPortHandler.isInBoundsBottom(_pointBuffer.y - shapeHalf),
+                viewPortHandler.isInBoundsLeft(_pointBuffer.x + shapeHalf)
+            else { continue }
+
+            guard viewPortHandler.isInBoundsRight(_pointBuffer.x - shapeHalf) else { break }
+
             let originalColor = dataSet.color(atIndex: Int(entry.x))
             
             var h: CGFloat = 0.0
@@ -320,7 +310,50 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
             
             high.setDraw(x: _pointBuffer.x, y: _pointBuffer.y)
         }
-        
-        context.restoreGState()
+    }
+
+    /// Creates a nested array of empty subarrays each of which will be populated with NSUIAccessibilityElements.
+    private func accessibilityCreateEmptyOrderedElements() -> [[NSUIAccessibilityElement]]
+    {
+        guard let chart = dataProvider as? BubbleChartView else { return [] }
+
+        let dataSetCount = chart.bubbleData?.dataSetCount ?? 0
+
+        return Array(repeating: [NSUIAccessibilityElement](),
+                     count: dataSetCount)
+    }
+
+    /// Creates an NSUIAccessibleElement representing individual bubbles location and relative size.
+    private func createAccessibleElement(withIndex idx: Int,
+                                         container: BubbleChartView,
+                                         dataSet: IBubbleChartDataSet,
+                                         dataSetIndex: Int,
+                                         shapeSize: CGFloat,
+                                         modifier: (NSUIAccessibilityElement) -> ()) -> NSUIAccessibilityElement
+    {
+        let element = NSUIAccessibilityElement(accessibilityContainer: container)
+        let xAxis = container.xAxis
+
+        guard let e = dataSet.entryForIndex(idx) else { return element }
+        guard let dataProvider = dataProvider else { return element }
+
+        // NOTE: The formatter can cause issues when the x-axis labels are consecutive ints.
+        // i.e. due to the Double conversion, if there are more than one data set that are grouped,
+        // there is the possibility of some labels being rounded up. A floor() might fix this, but seems to be a brute force solution.
+        let label = xAxis.valueFormatter?.stringForValue(e.x, axis: xAxis) ?? "\(e.x)"
+
+        let elementValueText = dataSet.valueFormatter?.stringForValue(e.y,
+                                                                      entry: e,
+                                                                      dataSetIndex: dataSetIndex,
+                                                                      viewPortHandler: viewPortHandler) ?? "\(e.y)"
+
+        let dataSetCount = dataProvider.bubbleData?.dataSetCount ?? -1
+        let doesContainMultipleDataSets = dataSetCount > 1
+
+        element.accessibilityLabel = "\(doesContainMultipleDataSets ? (dataSet.label ?? "")  + ", " : "") \(label): \(elementValueText), bubble size: \(String(format: "%.2f", (shapeSize/dataSet.maxSize) * 100)) %"
+
+        modifier(element)
+
+        return element
     }
 }
diff --git a/Source/Charts/Renderers/CandleStickChartRenderer.swift b/Source/Charts/Renderers/CandleStickChartRenderer.swift
index 3ec986cdf6..2cdaadf5bb 100644
--- a/Source/Charts/Renderers/CandleStickChartRenderer.swift
+++ b/Source/Charts/Renderers/CandleStickChartRenderer.swift
@@ -12,16 +12,11 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
-
 open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
 {
-    open weak var dataProvider: CandleChartDataProvider?
+    @objc open weak var dataProvider: CandleChartDataProvider?
     
-    public init(dataProvider: CandleChartDataProvider?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc public init(dataProvider: CandleChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
         
@@ -32,27 +27,34 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
     {
         guard let dataProvider = dataProvider, let candleData = dataProvider.candleData else { return }
 
-        for set in candleData.dataSets as! [ICandleChartDataSet]
+        // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+        accessibleChartElements.removeAll()
+
+        // Make the chart header the first element in the accessible elements array
+        if let chart = dataProvider as? CandleStickChartView {
+            let element = createAccessibleHeader(usingChart: chart,
+                                                 andData: candleData,
+                                                 withDefaultDescription: "CandleStick Chart")
+            accessibleChartElements.append(element)
+        }
+
+        for set in candleData.dataSets as! [ICandleChartDataSet] where set.isVisible
         {
-            if set.isVisible
-            {
-                drawDataSet(context: context, dataSet: set)
-            }
+            drawDataSet(context: context, dataSet: set)
         }
     }
     
-    fileprivate var _shadowPoints = [CGPoint](repeating: CGPoint(), count: 4)
-    fileprivate var _rangePoints = [CGPoint](repeating: CGPoint(), count: 2)
-    fileprivate var _openPoints = [CGPoint](repeating: CGPoint(), count: 2)
-    fileprivate var _closePoints = [CGPoint](repeating: CGPoint(), count: 2)
-    fileprivate var _bodyRect = CGRect()
-    fileprivate var _lineSegments = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _shadowPoints = [CGPoint](repeating: CGPoint(), count: 4)
+    private var _rangePoints = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _openPoints = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _closePoints = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _bodyRect = CGRect()
+    private var _lineSegments = [CGPoint](repeating: CGPoint(), count: 2)
     
-    open func drawDataSet(context: CGContext, dataSet: ICandleChartDataSet)
+    @objc open func drawDataSet(context: CGContext, dataSet: ICandleChartDataSet)
     {
-        guard let
-            dataProvider = dataProvider,
-            let animator = animator
+        guard
+            let dataProvider = dataProvider
             else { return }
 
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
@@ -66,8 +68,8 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
         context.saveGState()
         
         context.setLineWidth(dataSet.shadowWidth)
-        
-        for j in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
+
+        for j in _xBounds
         {
             // get the entry
             guard let e = dataSet.entryForIndex(j) as? CandleChartDataEntry else { continue }
@@ -79,6 +81,14 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
             let high = e.high
             let low = e.low
             
+            let doesContainMultipleDataSets = (dataProvider.candleData?.dataSets.count ?? 1) > 1
+            var accessibilityMovementDescription = "neutral"
+            var accessibilityRect = CGRect(x: CGFloat(xPos) + 0.5 - barSpace,
+                                           y: CGFloat(low * phaseY),
+                                           width: (2 * barSpace) - 1.0,
+                                           height: (CGFloat(abs(high - low) * phaseY)))
+            trans.rectValueToPixel(&accessibilityRect)
+
             if showCandleBar
             {
                 // calculate the shadow
@@ -149,9 +159,11 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
                 trans.rectValueToPixel(&_bodyRect)
                 
                 // draw body differently for increasing and decreasing entry
-                
+
                 if open > close
                 {
+                    accessibilityMovementDescription = "decreasing"
+
                     let color = dataSet.decreasingColor ?? dataSet.color(atIndex: j)
                     
                     if dataSet.isDecreasingFilled
@@ -167,6 +179,8 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
                 }
                 else if open < close
                 {
+                    accessibilityMovementDescription = "increasing"
+
                     let color = dataSet.increasingColor ?? dataSet.color(atIndex: j)
                     
                     if dataSet.isIncreasingFilled
@@ -211,13 +225,15 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
                 
                 // draw the ranges
                 var barColor: NSUIColor! = nil
-                
+
                 if open > close
                 {
+                    accessibilityMovementDescription = "decreasing"
                     barColor = dataSet.decreasingColor ?? dataSet.color(atIndex: j)
                 }
                 else if open < close
                 {
+                    accessibilityMovementDescription = "increasing"
                     barColor = dataSet.increasingColor ?? dataSet.color(atIndex: j)
                 }
                 else
@@ -230,8 +246,22 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
                 context.strokeLineSegments(between: _openPoints)
                 context.strokeLineSegments(between: _closePoints)
             }
+
+            let axElement = createAccessibleElement(withIndex: j,
+                                                    container: dataProvider,
+                                                    dataSet: dataSet)
+            { (element) in
+                element.accessibilityLabel = "\(doesContainMultipleDataSets ? "\(dataSet.label ?? "Dataset")" : "") " + "\(xPos) - \(accessibilityMovementDescription). low: \(low), high: \(high), opening: \(open), closing: \(close)"
+                element.accessibilityFrame = accessibilityRect
+            }
+
+            accessibleChartElements.append(axElement)
+
         }
-        
+
+        // Post this notification to let VoiceOver account for the redrawn frames
+        accessibilityPostLayoutChangedNotification()
+
         context.restoreGState()
     }
     
@@ -239,15 +269,13 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
     {
         guard
             let dataProvider = dataProvider,
-            let viewPortHandler = self.viewPortHandler,
-            let candleData = dataProvider.candleData,
-            let animator = animator
+            let candleData = dataProvider.candleData
             else { return }
         
         // if values are drawn
         if isDrawingValuesAllowed(dataProvider: dataProvider)
         {
-            var dataSets = candleData.dataSets
+            let dataSets = candleData.dataSets
             
             let phaseY = animator.phaseY
             
@@ -255,14 +283,11 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
             
             for i in 0 ..< dataSets.count
             {
-                guard let dataSet = dataSets[i] as? IBarLineScatterCandleBubbleChartDataSet
+                guard let
+                    dataSet = dataSets[i] as? IBarLineScatterCandleBubbleChartDataSet,
+                    shouldDrawValues(forDataSet: dataSet)
                     else { continue }
                 
-                if !shouldDrawValues(forDataSet: dataSet)
-                {
-                    continue
-                }
-                
                 let valueFont = dataSet.valueFont
                 
                 guard let formatter = dataSet.valueFormatter else { continue }
@@ -277,7 +302,7 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
                 let lineHeight = valueFont.lineHeight
                 let yOffset: CGFloat = lineHeight + 5.0
                 
-                for j in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
+                for j in _xBounds
                 {
                     guard let e = dataSet.entryForIndex(j) as? CandleChartDataEntry else { break }
                     
@@ -308,7 +333,7 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
                                 x: pt.x,
                                 y: pt.y - yOffset),
                             align: .center,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: dataSet.valueTextColorAt(j)])
+                            attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: dataSet.valueTextColorAt(j)])
                     }
                     
                     if let icon = e.icon, dataSet.isDrawIconsEnabled
@@ -332,8 +357,7 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
     {
         guard
             let dataProvider = dataProvider,
-            let candleData = dataProvider.candleData,
-            let animator = animator
+            let candleData = dataProvider.candleData
             else { return }
         
         context.saveGState()
@@ -380,4 +404,17 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
         
         context.restoreGState()
     }
+
+    private func createAccessibleElement(withIndex idx: Int,
+                                         container: CandleChartDataProvider,
+                                         dataSet: ICandleChartDataSet,
+                                         modifier: (NSUIAccessibilityElement) -> ()) -> NSUIAccessibilityElement {
+
+        let element = NSUIAccessibilityElement(accessibilityContainer: container)
+
+        // The modifier allows changing of traits and frame depending on highlight, rotation, etc
+        modifier(element)
+
+        return element
+    }
 }
diff --git a/Source/Charts/Renderers/ChartDataRendererBase.swift b/Source/Charts/Renderers/ChartDataRendererBase.swift
index f5773e1229..abbbcb0df1 100644
--- a/Source/Charts/Renderers/ChartDataRendererBase.swift
+++ b/Source/Charts/Renderers/ChartDataRendererBase.swift
@@ -12,50 +12,91 @@
 import Foundation
 import CoreGraphics
 
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 @objc(ChartDataRendererBase)
 open class DataRenderer: Renderer
 {
-    open var animator: Animator?
+    /// An array of accessibility elements that are presented to the ChartViewBase accessibility methods.
+    ///
+    /// Note that the order of elements in this array determines the order in which they are presented and navigated by
+    /// Accessibility clients such as VoiceOver.
+    ///
+    /// Renderers should ensure that the order of elements makes sense to a client presenting an audio-only interface to a user.
+    /// Subclasses should populate this array in drawData() or drawDataSet() to make the chart accessible.
+    @objc final var accessibleChartElements: [NSUIAccessibilityElement] = []
+
+    @objc public let animator: Animator
     
-    public init(animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc public init(animator: Animator, viewPortHandler: ViewPortHandler)
     {
-        super.init(viewPortHandler: viewPortHandler)
-        
         self.animator = animator
+
+        super.init(viewPortHandler: viewPortHandler)
     }
 
-    open func drawData(context: CGContext)
+    @objc open func drawData(context: CGContext)
     {
         fatalError("drawData() cannot be called on DataRenderer")
     }
     
-    open func drawValues(context: CGContext)
+    @objc open func drawValues(context: CGContext)
     {
         fatalError("drawValues() cannot be called on DataRenderer")
     }
     
-    open func drawExtras(context: CGContext)
+    @objc open func drawExtras(context: CGContext)
     {
         fatalError("drawExtras() cannot be called on DataRenderer")
     }
     
     /// Draws all highlight indicators for the values that are currently highlighted.
     ///
-    /// - parameter indices: the highlighted values
-    open func drawHighlighted(context: CGContext, indices: [Highlight])
+    /// - Parameters:
+    ///   - indices: the highlighted values
+    @objc open func drawHighlighted(context: CGContext, indices: [Highlight])
     {
         fatalError("drawHighlighted() cannot be called on DataRenderer")
     }
     
     /// An opportunity for initializing internal buffers used for rendering with a new size.
     /// Since this might do memory allocations, it should only be called if necessary.
-    open func initBuffers() { }
+    @objc open func initBuffers() { }
     
-    open func isDrawingValuesAllowed(dataProvider: ChartDataProvider?) -> Bool
+    @objc open func isDrawingValuesAllowed(dataProvider: ChartDataProvider?) -> Bool
     {
-        guard let data = dataProvider?.data
-            else { return false }
-        
-        return data.entryCount < Int(CGFloat(dataProvider?.maxVisibleCount ?? 0) * (viewPortHandler?.scaleX ?? 1.0))
+        guard let data = dataProvider?.data else { return false }
+        return data.entryCount < Int(CGFloat(dataProvider?.maxVisibleCount ?? 0) * viewPortHandler.scaleX)
+    }
+
+    /// Creates an ```NSUIAccessibilityElement``` that acts as the first and primary header describing a chart view.
+    ///
+    /// - Parameters:
+    ///   - chart: The chartView object being described
+    ///   - data: A non optional data source about the chart
+    ///   - defaultDescription: A simple string describing the type/design of Chart.
+    /// - Returns: A header ```NSUIAccessibilityElement``` that can be added to accessibleChartElements.
+    @objc internal func createAccessibleHeader(usingChart chart: ChartViewBase,
+                                        andData data: ChartData,
+                                        withDefaultDescription defaultDescription: String = "Chart") -> NSUIAccessibilityElement
+    {
+        let chartDescriptionText = chart.chartDescription?.text ?? defaultDescription
+        let dataSetDescriptions = data.dataSets.map { $0.label ?? "" }
+        let dataSetDescriptionText = dataSetDescriptions.joined(separator: ", ")
+        let dataSetCount = data.dataSets.count
+
+        let
+        element = NSUIAccessibilityElement(accessibilityContainer: chart)
+        element.accessibilityLabel = chartDescriptionText + ". \(dataSetCount) dataset\(dataSetCount == 1 ? "" : "s"). \(dataSetDescriptionText)"
+        element.accessibilityFrame = chart.bounds
+        element.isHeader = true
+
+        return element
     }
 }
diff --git a/Source/Charts/Renderers/CombinedChartRenderer.swift b/Source/Charts/Renderers/CombinedChartRenderer.swift
index 7c24d1cdee..8446c9b637 100644
--- a/Source/Charts/Renderers/CombinedChartRenderer.swift
+++ b/Source/Charts/Renderers/CombinedChartRenderer.swift
@@ -14,19 +14,19 @@ import CoreGraphics
 
 open class CombinedChartRenderer: DataRenderer
 {
-    open weak var chart: CombinedChartView?
+    @objc open weak var chart: CombinedChartView?
     
     /// if set to true, all values are drawn above their bars, instead of below their top
-    open var drawValueAboveBarEnabled = true
+    @objc open var drawValueAboveBarEnabled = true
     
     /// if set to true, a grey area is drawn behind each bar that indicates the maximum value
-    open var drawBarShadowEnabled = false
+    @objc open var drawBarShadowEnabled = false
     
     internal var _renderers = [DataRenderer]()
     
     internal var _drawOrder: [CombinedChartView.DrawOrder] = [.bar, .bubble, .line, .candle, .scatter]
     
-    public init(chart: CombinedChartView?, animator: Animator, viewPortHandler: ViewPortHandler?)
+    @objc public init(chart: CombinedChartView, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
         
@@ -40,11 +40,7 @@ open class CombinedChartRenderer: DataRenderer
     {
         _renderers = [DataRenderer]()
         
-        guard let
-            chart = chart,
-            let animator = animator,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let chart = chart else { return }
 
         for order in drawOrder
         {
@@ -91,34 +87,38 @@ open class CombinedChartRenderer: DataRenderer
     
     open override func initBuffers()
     {
-        for renderer in _renderers
-        {
-            renderer.initBuffers()
-        }
+        _renderers.forEach { $0.initBuffers() }
     }
     
     open override func drawData(context: CGContext)
     {
-        for renderer in _renderers
-        {
-            renderer.drawData(context: context)
+        // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+        accessibleChartElements.removeAll()
+
+        if
+            let combinedChart = chart,
+            let data = combinedChart.data {
+            // Make the chart header the first element in the accessible elements array
+            let element = createAccessibleHeader(usingChart: combinedChart,
+                                                 andData: data,
+                                                 withDefaultDescription: "Combined Chart")
+            accessibleChartElements.append(element)
         }
+
+        // TODO: Due to the potential complexity of data presented in Combined charts, a more usable way
+        // for VO accessibility would be to use axis based traversal rather than by dataset.
+        // Hence, accessibleChartElements is not populated below. (Individual renderers guard against dataSource being their respective views)
+        _renderers.forEach { $0.drawData(context: context) }
     }
     
     open override func drawValues(context: CGContext)
     {
-        for renderer in _renderers
-        {
-            renderer.drawValues(context: context)
-        }
+        _renderers.forEach { $0.drawValues(context: context) }
     }
     
     open override func drawExtras(context: CGContext)
     {
-        for renderer in _renderers
-        {
-            renderer.drawExtras(context: context)
-        }
+        _renderers.forEach { $0.drawExtras(context: context) }
     }
     
     open override func drawHighlighted(context: CGContext, indices: [Highlight])
@@ -148,7 +148,12 @@ open class CombinedChartRenderer: DataRenderer
                 data = (renderer as! BubbleChartRenderer).dataProvider?.bubbleData
             }
             
-            let dataIndex = data == nil ? nil : (chart?.data as? CombinedChartData)?.allData.index(of: data!)
+            let dataIndex: Int? = {
+                guard let data = data else { return nil }
+                return (chart?.data as? CombinedChartData)?
+                    .allData
+                    .firstIndex(of: data)
+            }()
             
             let dataIndices = indices.filter{ $0.dataIndex == dataIndex || $0.dataIndex == -1 }
             
@@ -156,8 +161,8 @@ open class CombinedChartRenderer: DataRenderer
         }
     }
 
-    /// - returns: The sub-renderer object at the specified index.
-    open func getSubRenderer(index: Int) -> DataRenderer?
+    /// - Returns: The sub-renderer object at the specified index.
+    @objc open func getSubRenderer(index: Int) -> DataRenderer?
     {
         if index >= _renderers.count || index < 0
         {
@@ -169,8 +174,8 @@ open class CombinedChartRenderer: DataRenderer
         }
     }
 
-    /// - returns: All sub-renderers.
-    open var subRenderers: [DataRenderer]
+    /// All sub-renderers.
+    @objc open var subRenderers: [DataRenderer]
     {
         get { return _renderers }
         set { _renderers = newValue }
@@ -178,11 +183,11 @@ open class CombinedChartRenderer: DataRenderer
     
     // MARK: Accessors
     
-    /// - returns: `true` if drawing values above bars is enabled, `false` ifnot
-    open var isDrawValueAboveBarEnabled: Bool { return drawValueAboveBarEnabled }
+    /// `true` if drawing values above bars is enabled, `false` ifnot
+    @objc open var isDrawValueAboveBarEnabled: Bool { return drawValueAboveBarEnabled }
     
-    /// - returns: `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot
-    open var isDrawBarShadowEnabled: Bool { return drawBarShadowEnabled }
+    /// `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot
+    @objc open var isDrawBarShadowEnabled: Bool { return drawBarShadowEnabled }
     
     /// the order in which the provided data objects should be drawn.
     /// The earlier you place them in the provided array, the further they will be in the background.
diff --git a/Source/Charts/Renderers/HorizontalBarChartRenderer.swift b/Source/Charts/Renderers/HorizontalBarChartRenderer.swift
index 7d2b03f14e..36f4a6c846 100644
--- a/Source/Charts/Renderers/HorizontalBarChartRenderer.swift
+++ b/Source/Charts/Renderers/HorizontalBarChartRenderer.swift
@@ -12,25 +12,28 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
 
 open class HorizontalBarChartRenderer: BarChartRenderer
 {
-    fileprivate class Buffer
+    private class Buffer
     {
         var rects = [CGRect]()
     }
     
-    public override init(dataProvider: BarChartDataProvider?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    public override init(dataProvider: BarChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(dataProvider: dataProvider, animator: animator, viewPortHandler: viewPortHandler)
     }
     
     // [CGRect] per dataset
-    fileprivate var _buffers = [Buffer]()
+    private var _buffers = [Buffer]()
     
     open override func initBuffers()
     {
@@ -65,12 +68,11 @@ open class HorizontalBarChartRenderer: BarChartRenderer
         }
     }
     
-    fileprivate func prepareBuffer(dataSet: IBarChartDataSet, index: Int)
+    private func prepareBuffer(dataSet: IBarChartDataSet, index: Int)
     {
         guard let
             dataProvider = dataProvider,
-            let barData = dataProvider.barData,
-            let animator = animator
+            let barData = dataProvider.barData
             else { return }
         
         let barWidthHalf = barData.barWidth / 2.0
@@ -178,14 +180,11 @@ open class HorizontalBarChartRenderer: BarChartRenderer
         }
     }
     
-    fileprivate var _barShadowRectBuffer: CGRect = CGRect()
+    private var _barShadowRectBuffer: CGRect = CGRect()
     
     open override func drawDataSet(context: CGContext, dataSet: IBarChartDataSet, index: Int)
     {
-        guard let
-            dataProvider = dataProvider,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let dataProvider = dataProvider else { return }
         
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
         
@@ -201,10 +200,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
         // draw the bar shadow before the values
         if dataProvider.isDrawBarShadowEnabled
         {
-            guard
-                let animator = animator,
-                let barData = dataProvider.barData
-                else { return }
+            guard let barData = dataProvider.barData else { return }
             
             let barWidth = barData.barWidth
             let barWidthHalf = barWidth / 2.0
@@ -247,7 +243,11 @@ open class HorizontalBarChartRenderer: BarChartRenderer
         {
             context.setFillColor(dataSet.color(atIndex: 0).cgColor)
         }
-        
+
+        // In case the chart is stacked, we need to accomodate individual bars within accessibilityOrdereredElements
+        let isStacked = dataSet.isStacked
+        let stackSize = isStacked ? dataSet.stackSize : 1
+
         for j in stride(from: 0, to: buffer.rects.count, by: 1)
         {
             let barRect = buffer.rects[j]
@@ -267,15 +267,30 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                 // Set the color for the currently drawn value. If the index is out of bounds, reuse colors.
                 context.setFillColor(dataSet.color(atIndex: j).cgColor)
             }
-            
+
             context.fill(barRect)
-            
+
             if drawBorder
             {
                 context.setStrokeColor(borderColor.cgColor)
                 context.setLineWidth(borderWidth)
                 context.stroke(barRect)
             }
+
+            // Create and append the corresponding accessibility element to accessibilityOrderedElements (see BarChartRenderer)
+            if let chart = dataProvider as? BarChartView
+            {
+                let element = createAccessibleElement(withIndex: j,
+                                                      container: chart,
+                                                      dataSet: dataSet,
+                                                      dataSetIndex: index,
+                                                      stackSize: stackSize)
+                { (element) in
+                    element.accessibilityFrame = barRect
+                }
+
+                accessibilityOrderedElements[j/stackSize].append(element)
+            }
         }
         
         context.restoreGState()
@@ -299,7 +314,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
         rect.size.width = CGFloat(right - left)
         rect.size.height = CGFloat(bottom - top)
         
-        trans.rectValueToPixelHorizontal(&rect, phaseY: animator?.phaseY ?? 1.0)
+        trans.rectValueToPixelHorizontal(&rect, phaseY: animator.phaseY)
     }
     
     open override func drawValues(context: CGContext)
@@ -309,12 +324,10 @@ open class HorizontalBarChartRenderer: BarChartRenderer
         {
             guard
                 let dataProvider = dataProvider,
-                let barData = dataProvider.barData,
-                let animator = animator,
-                let viewPortHandler = self.viewPortHandler
+                let barData = dataProvider.barData
                 else { return }
             
-            var dataSets = barData.dataSets
+            let dataSets = barData.dataSets
             
             let textAlign = NSTextAlignment.left
             
@@ -325,12 +338,10 @@ open class HorizontalBarChartRenderer: BarChartRenderer
             
             for dataSetIndex in 0 ..< barData.dataSetCount
             {
-                guard let dataSet = dataSets[dataSetIndex] as? IBarChartDataSet else { continue }
-                
-                if !shouldDrawValues(forDataSet: dataSet) || !(dataSet.isDrawIconsEnabled && dataSet.isVisible)
-                {
-                    continue
-                }
+                guard let
+                    dataSet = dataSets[dataSetIndex] as? IBarChartDataSet,
+                    shouldDrawValues(forDataSet: dataSet)
+                    else { continue }
                 
                 let isInverted = dataProvider.isInverted(axis: dataSet.axisDependency)
                 
@@ -381,9 +392,9 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                             viewPortHandler: viewPortHandler)
                         
                         // calculate the correct offset depending on the draw position of the value
-                        let valueTextWidth = valueText.size(attributes: [NSFontAttributeName: valueFont]).width
+                        let valueTextWidth = valueText.size(withAttributes: [NSAttributedString.Key.font: valueFont]).width
                         posOffset = (drawValueAboveBar ? valueOffsetPlus : -(valueTextWidth + valueOffsetPlus))
-                        negOffset = (drawValueAboveBar ? -(valueTextWidth + valueOffsetPlus) : valueOffsetPlus)
+                        negOffset = (drawValueAboveBar ? -(valueTextWidth + valueOffsetPlus) : valueOffsetPlus) - rect.size.width
                         
                         if isInverted
                         {
@@ -462,7 +473,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                                 viewPortHandler: viewPortHandler)
                             
                             // calculate the correct offset depending on the draw position of the value
-                            let valueTextWidth = valueText.size(attributes: [NSFontAttributeName: valueFont]).width
+                            let valueTextWidth = valueText.size(withAttributes: [NSAttributedString.Key.font: valueFont]).width
                             posOffset = (drawValueAboveBar ? valueOffsetPlus : -(valueTextWidth + valueOffsetPlus))
                             negOffset = (drawValueAboveBar ? -(valueTextWidth + valueOffsetPlus) : valueOffsetPlus)
                             
@@ -546,7 +557,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
                                     viewPortHandler: viewPortHandler)
                                 
                                 // calculate the correct offset depending on the draw position of the value
-                                let valueTextWidth = valueText.size(attributes: [NSFontAttributeName: valueFont]).width
+                                let valueTextWidth = valueText.size(withAttributes: [NSAttributedString.Key.font: valueFont]).width
                                 posOffset = (drawValueAboveBar ? valueOffsetPlus : -(valueTextWidth + valueOffsetPlus))
                                 negOffset = (drawValueAboveBar ? -(valueTextWidth + valueOffsetPlus) : valueOffsetPlus)
                                 
@@ -610,8 +621,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
     {
         guard let data = dataProvider?.data
             else { return false }
-        
-        return data.entryCount < Int(CGFloat(dataProvider?.maxVisibleCount ?? 0) * (viewPortHandler?.scaleY ?? 1.0))
+        return data.entryCount < Int(CGFloat(dataProvider?.maxVisibleCount ?? 0) * self.viewPortHandler.scaleY)
     }
     
     /// Sets the drawing position of the highlight object based on the riven bar-rect.
diff --git a/Source/Charts/Renderers/LegendRenderer.swift b/Source/Charts/Renderers/LegendRenderer.swift
index e5096b1d7a..b9514b4fcf 100755
--- a/Source/Charts/Renderers/LegendRenderer.swift
+++ b/Source/Charts/Renderers/LegendRenderer.swift
@@ -12,17 +12,13 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 @objc(ChartLegendRenderer)
 open class LegendRenderer: Renderer
 {
     /// the legend object this renderer renders
-    open var legend: Legend?
+    @objc open var legend: Legend?
 
-    public init(viewPortHandler: ViewPortHandler?, legend: Legend?)
+    @objc public init(viewPortHandler: ViewPortHandler, legend: Legend?)
     {
         super.init(viewPortHandler: viewPortHandler)
         
@@ -30,12 +26,9 @@ open class LegendRenderer: Renderer
     }
 
     /// Prepares the legend and calculates all needed forms, labels and colors.
-    open func computeLegend(data: ChartData)
+    @objc open func computeLegend(data: ChartData)
     {
-        guard
-            let legend = legend,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let legend = legend else { return }
         
         if !legend.isLegendCustom
         {
@@ -46,7 +39,7 @@ open class LegendRenderer: Renderer
             {
                 guard let dataSet = data.getDataSetByIndex(i) else { continue }
                 
-                var clrs: [NSUIColor] = dataSet.colors
+                let clrs: [NSUIColor] = dataSet.colors
                 let entryCount = dataSet.entryCount
                 
                 // if we have a barchart with stacked bars
@@ -54,13 +47,25 @@ open class LegendRenderer: Renderer
                     (dataSet as! IBarChartDataSet).isStacked
                 {
                     let bds = dataSet as! IBarChartDataSet
-                    var sLabels = bds.stackLabels
-                    
-                    for j in 0..<min(clrs.count, bds.stackSize)
+                    let sLabels = bds.stackLabels
+                    let minEntries = min(clrs.count, bds.stackSize)
+
+                    for j in 0..<minEntries
                     {
+                        let label: String?
+                        if (sLabels.count > 0)
+                        {
+                            let labelIndex = j % minEntries
+                            label = sLabels.indices.contains(labelIndex) ? sLabels[labelIndex] : nil
+                        }
+                        else
+                        {
+                            label = nil
+                        }
+
                         entries.append(
                             LegendEntry(
-                                label: sLabels[j % sLabels.count],
+                                label: label,
                                 form: dataSet.form,
                                 formSize: dataSet.formSize,
                                 formLineWidth: dataSet.formLineWidth,
@@ -192,12 +197,9 @@ open class LegendRenderer: Renderer
         legend.calculateDimensions(labelFont: legend.font, viewPortHandler: viewPortHandler)
     }
     
-    open func renderLegend(context: CGContext)
+    @objc open func renderLegend(context: CGContext)
     {
-        guard
-            let legend = legend,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let legend = legend else { return }
         
         if !legend.enabled
         {
@@ -209,7 +211,7 @@ open class LegendRenderer: Renderer
         let labelLineHeight = labelFont.lineHeight
         let formYOffset = labelLineHeight / 2.0
 
-        var entries = legend.entries
+        let entries = legend.entries
         
         let defaultFormSize = legend.formSize
         let formToTextSpace = legend.formToTextSpace
@@ -297,9 +299,9 @@ open class LegendRenderer: Renderer
         {
         case .horizontal:
             
-            var calculatedLineSizes = legend.calculatedLineSizes
-            var calculatedLabelSizes = legend.calculatedLabelSizes
-            var calculatedLabelBreakPoints = legend.calculatedLabelBreakPoints
+            let calculatedLineSizes = legend.calculatedLineSizes
+            let calculatedLabelSizes = legend.calculatedLabelSizes
+            let calculatedLabelBreakPoints = legend.calculatedLabelBreakPoints
             
             var posX: CGFloat = originPosX
             var posY: CGFloat
@@ -468,7 +470,7 @@ open class LegendRenderer: Renderer
                     
                     if direction == .rightToLeft
                     {
-                        posX -= (e.label as NSString!).size(attributes: [NSFontAttributeName: labelFont]).width
+                        posX -= (e.label! as NSString).size(withAttributes: [.font: labelFont]).width
                     }
                     
                     if !wasStacked
@@ -494,10 +496,10 @@ open class LegendRenderer: Renderer
         }
     }
 
-    fileprivate var _formLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _formLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
     
     /// Draws the Legend-form at the given position with the color at the given index.
-    open func drawForm(
+    @objc open func drawForm(
         context: CGContext,
         x: CGFloat,
         y: CGFloat,
@@ -569,8 +571,8 @@ open class LegendRenderer: Renderer
     }
 
     /// Draws the provided label at the given position.
-    open func drawLabel(context: CGContext, x: CGFloat, y: CGFloat, label: String, font: NSUIFont, textColor: NSUIColor)
+    @objc open func drawLabel(context: CGContext, x: CGFloat, y: CGFloat, label: String, font: NSUIFont, textColor: NSUIColor)
     {
-        ChartUtils.drawText(context: context, text: label, point: CGPoint(x: x, y: y), align: .left, attributes: [NSFontAttributeName: font, NSForegroundColorAttributeName: textColor])
+        ChartUtils.drawText(context: context, text: label, point: CGPoint(x: x, y: y), align: .left, attributes: [NSAttributedString.Key.font: font, NSAttributedString.Key.foregroundColor: textColor])
     }
 }
diff --git a/Source/Charts/Renderers/LineChartRenderer.swift b/Source/Charts/Renderers/LineChartRenderer.swift
index f4978a64b4..69e94366ad 100755
--- a/Source/Charts/Renderers/LineChartRenderer.swift
+++ b/Source/Charts/Renderers/LineChartRenderer.swift
@@ -12,16 +12,17 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
-
 open class LineChartRenderer: LineRadarRenderer
 {
-    open weak var dataProvider: LineChartDataProvider?
+    // TODO: Currently, this nesting isn't necessary for LineCharts. However, it will make it much easier to add a custom rotor
+    // that navigates between datasets.
+    // NOTE: Unlike the other renderers, LineChartRenderer populates accessibleChartElements in drawCircles due to the nature of its drawing options.
+    /// A nested array of elements ordered logically (i.e not in visual/drawing order) for use with VoiceOver.
+    private lazy var accessibilityOrderedElements: [[NSUIAccessibilityElement]] = accessibilityCreateEmptyOrderedElements()
+
+    @objc open weak var dataProvider: LineChartDataProvider?
     
-    public init(dataProvider: LineChartDataProvider?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc public init(dataProvider: LineChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
         
@@ -48,7 +49,7 @@ open class LineChartRenderer: LineRadarRenderer
         }
     }
     
-    open func drawDataSet(context: CGContext, dataSet: ILineChartDataSet)
+    @objc open func drawDataSet(context: CGContext, dataSet: ILineChartDataSet)
     {
         if dataSet.entryCount < 1
         {
@@ -67,6 +68,8 @@ open class LineChartRenderer: LineRadarRenderer
             context.setLineDash(phase: 0.0, lengths: [])
         }
         
+        context.setLineCap(dataSet.lineCapType)
+        
         // if drawing cubic lines is enabled
         switch dataSet.mode
         {
@@ -84,12 +87,9 @@ open class LineChartRenderer: LineRadarRenderer
         context.restoreGState()
     }
     
-    open func drawCubicBezier(context: CGContext, dataSet: ILineChartDataSet)
+    @objc open func drawCubicBezier(context: CGContext, dataSet: ILineChartDataSet)
     {
-        guard
-            let dataProvider = dataProvider,
-            let animator = animator
-            else { return }
+        guard let dataProvider = dataProvider else { return }
         
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
         
@@ -117,10 +117,8 @@ open class LineChartRenderer: LineRadarRenderer
             // Take an extra point from the left, and an extra from the right.
             // That's because we need 4 points for a cubic bezier (cubic=4), otherwise we get lines moving and doing weird stuff on the edges of the chart.
             // So in the starting `prev` and `cur`, go -2, -1
-            // And in the `lastIndex`, add +1
             
             let firstIndex = _xBounds.min + 1
-            let lastIndex = _xBounds.min + _xBounds.range
             
             var prevPrev: ChartDataEntry! = nil
             var prev: ChartDataEntry! = dataSet.entryForIndex(max(firstIndex - 2, 0))
@@ -133,7 +131,7 @@ open class LineChartRenderer: LineRadarRenderer
             // let the spline start
             cubicPath.move(to: CGPoint(x: CGFloat(cur.x), y: CGFloat(cur.y * phaseY)), transform: valueToPixelMatrix)
             
-            for j in stride(from: firstIndex, through: lastIndex, by: 1)
+            for j in _xBounds.dropFirst()  // same as firstIndex
             {
                 prevPrev = prev
                 prev = cur
@@ -183,12 +181,9 @@ open class LineChartRenderer: LineRadarRenderer
         context.restoreGState()
     }
     
-    open func drawHorizontalBezier(context: CGContext, dataSet: ILineChartDataSet)
+    @objc open func drawHorizontalBezier(context: CGContext, dataSet: ILineChartDataSet)
     {
-        guard
-            let dataProvider = dataProvider,
-            let animator = animator
-            else { return }
+        guard let dataProvider = dataProvider else { return }
         
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
         
@@ -214,7 +209,7 @@ open class LineChartRenderer: LineRadarRenderer
             // let the spline start
             cubicPath.move(to: CGPoint(x: CGFloat(cur.x), y: CGFloat(cur.y * phaseY)), transform: valueToPixelMatrix)
             
-            for j in stride(from: (_xBounds.min + 1), through: _xBounds.range + _xBounds.min, by: 1)
+            for j in _xBounds.dropFirst()
             {
                 prev = cur
                 cur = dataSet.entryForIndex(j)
@@ -290,15 +285,11 @@ open class LineChartRenderer: LineRadarRenderer
         }
     }
     
-    fileprivate var _lineSegments = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _lineSegments = [CGPoint](repeating: CGPoint(), count: 2)
     
-    open func drawLinear(context: CGContext, dataSet: ILineChartDataSet)
+    @objc open func drawLinear(context: CGContext, dataSet: ILineChartDataSet)
     {
-        guard
-            let dataProvider = dataProvider,
-            let animator = animator,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let dataProvider = dataProvider else { return }
         
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
         
@@ -319,126 +310,74 @@ open class LineChartRenderer: LineRadarRenderer
         }
         
         context.saveGState()
-        
-        context.setLineCap(dataSet.lineCapType)
 
-        // more than 1 color
-        if dataSet.colors.count > 1
-        {
             if _lineSegments.count != pointsPerEntryPair
             {
                 // Allocate once in correct size
                 _lineSegments = [CGPoint](repeating: CGPoint(), count: pointsPerEntryPair)
             }
+
+        for j in _xBounds.dropLast()
+        {
+            var e: ChartDataEntry! = dataSet.entryForIndex(j)
+            
+            if e == nil { continue }
             
-            for j in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
+            _lineSegments[0].x = CGFloat(e.x)
+            _lineSegments[0].y = CGFloat(e.y * phaseY)
+            
+            if j < _xBounds.max
             {
-                var e: ChartDataEntry! = dataSet.entryForIndex(j)
-                
-                if e == nil { continue }
+                // TODO: remove the check.
+                // With the new XBounds iterator, j is always smaller than _xBounds.max
+                // Keeping this check for a while, if xBounds have no further breaking changes, it should be safe to remove the check
+                e = dataSet.entryForIndex(j + 1)
                 
-                _lineSegments[0].x = CGFloat(e.x)
-                _lineSegments[0].y = CGFloat(e.y * phaseY)
+                if e == nil { break }
                 
-                if j < _xBounds.max
+                if isDrawSteppedEnabled
                 {
-                    e = dataSet.entryForIndex(j + 1)
-                    
-                    if e == nil { break }
-                    
-                    if isDrawSteppedEnabled
-                    {
-                        _lineSegments[1] = CGPoint(x: CGFloat(e.x), y: _lineSegments[0].y)
-                        _lineSegments[2] = _lineSegments[1]
-                        _lineSegments[3] = CGPoint(x: CGFloat(e.x), y: CGFloat(e.y * phaseY))
-                    }
-                    else
-                    {
-                        _lineSegments[1] = CGPoint(x: CGFloat(e.x), y: CGFloat(e.y * phaseY))
-                    }
+                    _lineSegments[1] = CGPoint(x: CGFloat(e.x), y: _lineSegments[0].y)
+                    _lineSegments[2] = _lineSegments[1]
+                    _lineSegments[3] = CGPoint(x: CGFloat(e.x), y: CGFloat(e.y * phaseY))
                 }
                 else
                 {
-                    _lineSegments[1] = _lineSegments[0]
+                    _lineSegments[1] = CGPoint(x: CGFloat(e.x), y: CGFloat(e.y * phaseY))
                 }
+            }
+            else
+            {
+                _lineSegments[1] = _lineSegments[0]
+            }
 
-                for i in 0..<_lineSegments.count
-                {
-                    _lineSegments[i] = _lineSegments[i].applying(valueToPixelMatrix)
-                }
-                
-                if (!viewPortHandler.isInBoundsRight(_lineSegments[0].x))
-                {
-                    break
-                }
-                
-                // make sure the lines don't do shitty things outside bounds
-                if !viewPortHandler.isInBoundsLeft(_lineSegments[1].x)
-                    || (!viewPortHandler.isInBoundsTop(_lineSegments[0].y) && !viewPortHandler.isInBoundsBottom(_lineSegments[1].y))
-                {
-                    continue
-                }
-                
-                // get the color that is set for this line-segment
-                context.setStrokeColor(dataSet.color(atIndex: j).cgColor)
-                context.strokeLineSegments(between: _lineSegments)
+            for i in 0..<_lineSegments.count
+            {
+                _lineSegments[i] = _lineSegments[i].applying(valueToPixelMatrix)
             }
-        }
-        else
-        { // only one color per dataset
             
-            var e1: ChartDataEntry!
-            var e2: ChartDataEntry!
+            if !viewPortHandler.isInBoundsRight(_lineSegments[0].x)
+            {
+                break
+            }
             
-            e1 = dataSet.entryForIndex(_xBounds.min)
+            // Determine the start and end coordinates of the line, and make sure they differ.
+            guard
+                let firstCoordinate = _lineSegments.first,
+                let lastCoordinate = _lineSegments.last,
+                firstCoordinate != lastCoordinate else { continue }
             
-            if e1 != nil
+            // make sure the lines don't do shitty things outside bounds
+            if !viewPortHandler.isInBoundsLeft(lastCoordinate.x) ||
+                !viewPortHandler.isInBoundsTop(max(firstCoordinate.y, lastCoordinate.y)) ||
+                !viewPortHandler.isInBoundsBottom(min(firstCoordinate.y, lastCoordinate.y))
             {
-                context.beginPath()
-                var firstPoint = true
-                
-                for x in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
-                {
-                    e1 = dataSet.entryForIndex(x == 0 ? 0 : (x - 1))
-                    e2 = dataSet.entryForIndex(x)
-                    
-                    if e1 == nil || e2 == nil { continue }
-                    
-                    let pt = CGPoint(
-                        x: CGFloat(e1.x),
-                        y: CGFloat(e1.y * phaseY)
-                        ).applying(valueToPixelMatrix)
-                    
-                    if firstPoint
-                    {
-                        context.move(to: pt)
-                        firstPoint = false
-                    }
-                    else
-                    {
-                        context.addLine(to: pt)
-                    }
-                    
-                    if isDrawSteppedEnabled
-                    {
-                        context.addLine(to: CGPoint(
-                            x: CGFloat(e2.x),
-                            y: CGFloat(e1.y * phaseY)
-                            ).applying(valueToPixelMatrix))
-                    }
-                    
-                    context.addLine(to: CGPoint(
-                            x: CGFloat(e2.x),
-                            y: CGFloat(e2.y * phaseY)
-                        ).applying(valueToPixelMatrix))
-                }
-                
-                if !firstPoint
-                {
-                    context.setStrokeColor(dataSet.color(atIndex: 0).cgColor)
-                    context.strokePath()
-                }
+                continue
             }
+            
+            // get the color that is set for this line-segment
+            context.setStrokeColor(dataSet.color(atIndex: j).cgColor)
+            context.strokeLineSegments(between: _lineSegments)
         }
         
         context.restoreGState()
@@ -465,9 +404,9 @@ open class LineChartRenderer: LineRadarRenderer
     }
     
     /// Generates the path that is used for filled drawing.
-    fileprivate func generateFilledPath(dataSet: ILineChartDataSet, fillMin: CGFloat, bounds: XBounds, matrix: CGAffineTransform) -> CGPath
+    private func generateFilledPath(dataSet: ILineChartDataSet, fillMin: CGFloat, bounds: XBounds, matrix: CGAffineTransform) -> CGPath
     {
-        let phaseY = animator?.phaseY ?? 1.0
+        let phaseY = animator.phaseY
         let isDrawSteppedEnabled = dataSet.mode == .stepped
         let matrix = matrix
         
@@ -511,14 +450,12 @@ open class LineChartRenderer: LineRadarRenderer
     {
         guard
             let dataProvider = dataProvider,
-            let lineData = dataProvider.lineData,
-            let animator = animator,
-            let viewPortHandler = self.viewPortHandler
+            let lineData = dataProvider.lineData
             else { return }
-        
+
         if isDrawingValuesAllowed(dataProvider: dataProvider)
         {
-            var dataSets = lineData.dataSets
+            let dataSets = lineData.dataSets
             
             let phaseY = animator.phaseY
             
@@ -526,12 +463,10 @@ open class LineChartRenderer: LineRadarRenderer
             
             for i in 0 ..< dataSets.count
             {
-                guard let dataSet = dataSets[i] as? ILineChartDataSet else { continue }
-                
-                if !shouldDrawValues(forDataSet: dataSet)
-                {
-                    continue
-                }
+                guard let
+                    dataSet = dataSets[i] as? ILineChartDataSet,
+                    shouldDrawValues(forDataSet: dataSet)
+                    else { continue }
                 
                 let valueFont = dataSet.valueFont
                 
@@ -551,8 +486,8 @@ open class LineChartRenderer: LineRadarRenderer
                 }
                 
                 _xBounds.set(chart: dataProvider, dataSet: dataSet, animator: animator)
-                
-                for j in stride(from: _xBounds.min, through: min(_xBounds.min + _xBounds.range, _xBounds.max), by: 1)
+
+                for j in _xBounds
                 {
                     guard let e = dataSet.entryForIndex(j) else { break }
                     
@@ -582,7 +517,7 @@ open class LineChartRenderer: LineRadarRenderer
                                 x: pt.x,
                                 y: pt.y - CGFloat(valOffset) - valueFont.lineHeight),
                             align: .center,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: dataSet.valueTextColorAt(j)])
+                            attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: dataSet.valueTextColorAt(j)])
                     }
                     
                     if let icon = e.icon, dataSet.isDrawIconsEnabled
@@ -603,29 +538,39 @@ open class LineChartRenderer: LineRadarRenderer
         drawCircles(context: context)
     }
     
-    fileprivate func drawCircles(context: CGContext)
+    private func drawCircles(context: CGContext)
     {
         guard
             let dataProvider = dataProvider,
-            let lineData = dataProvider.lineData,
-            let animator = animator,
-            let viewPortHandler = self.viewPortHandler
+            let lineData = dataProvider.lineData
             else { return }
         
         let phaseY = animator.phaseY
-        
+
         let dataSets = lineData.dataSets
         
         var pt = CGPoint()
         var rect = CGRect()
         
+        // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+        accessibleChartElements.removeAll()
+        accessibilityOrderedElements = accessibilityCreateEmptyOrderedElements()
+
+        // Make the chart header the first element in the accessible elements array
+        if let chart = dataProvider as? LineChartView {
+            let element = createAccessibleHeader(usingChart: chart,
+                                                 andData: lineData,
+                                                 withDefaultDescription: "Line Chart")
+            accessibleChartElements.append(element)
+        }
+
         context.saveGState()
-        
+
         for i in 0 ..< dataSets.count
         {
             guard let dataSet = lineData.getDataSetByIndex(i) as? ILineChartDataSet else { continue }
             
-            if !dataSet.isVisible || !dataSet.isDrawCirclesEnabled || dataSet.entryCount == 0
+            if !dataSet.isVisible || dataSet.entryCount == 0
             {
                 continue
             }
@@ -647,7 +592,7 @@ open class LineChartRenderer: LineRadarRenderer
                 (dataSet.circleHoleColor == nil ||
                     dataSet.circleHoleColor == NSUIColor.clear)
             
-            for j in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
+            for j in _xBounds
             {
                 guard let e = dataSet.entryForIndex(j) else { break }
 
@@ -666,13 +611,41 @@ open class LineChartRenderer: LineRadarRenderer
                     continue
                 }
                 
-                context.setFillColor(dataSet.getCircleColor(atIndex: j)!.cgColor)
                 
+                // Skip Circles and Accessibility if not enabled,
+                // reduces CPU significantly if not needed
+                if !dataSet.isDrawCirclesEnabled
+                {
+                    continue
+                }
+                
+                // Accessibility element geometry
+                let scaleFactor: CGFloat = 3
+                let accessibilityRect = CGRect(x: pt.x - (scaleFactor * circleRadius),
+                                               y: pt.y - (scaleFactor * circleRadius),
+                                               width: scaleFactor * circleDiameter,
+                                               height: scaleFactor * circleDiameter)
+                // Create and append the corresponding accessibility element to accessibilityOrderedElements
+                if let chart = dataProvider as? LineChartView
+                {
+                    let element = createAccessibleElement(withIndex: j,
+                                                          container: chart,
+                                                          dataSet: dataSet,
+                                                          dataSetIndex: i)
+                    { (element) in
+                        element.accessibilityFrame = accessibilityRect
+                    }
+
+                    accessibilityOrderedElements[i].append(element)
+                }
+
+                context.setFillColor(dataSet.getCircleColor(atIndex: j)!.cgColor)
+
                 rect.origin.x = pt.x - circleRadius
                 rect.origin.y = pt.y - circleRadius
                 rect.size.width = circleDiameter
                 rect.size.height = circleDiameter
-                
+
                 if drawTransparentCircleHole
                 {
                     // Begin path for circle with hole
@@ -710,14 +683,17 @@ open class LineChartRenderer: LineRadarRenderer
         }
         
         context.restoreGState()
+
+        // Merge nested ordered arrays into the single accessibleChartElements.
+        accessibleChartElements.append(contentsOf: accessibilityOrderedElements.flatMap { $0 } )
+        accessibilityPostLayoutChangedNotification()
     }
     
     open override func drawHighlighted(context: CGContext, indices: [Highlight])
     {
         guard
             let dataProvider = dataProvider,
-            let lineData = dataProvider.lineData,
-            let animator = animator
+            let lineData = dataProvider.lineData
             else { return }
         
         let chartXMax = dataProvider.chartXMax
@@ -748,8 +724,8 @@ open class LineChartRenderer: LineRadarRenderer
                 context.setLineDash(phase: 0.0, lengths: [])
             }
             
-            let x = high.x // get the x-position
-            let y = high.y * Double(animator.phaseY)
+            let x = e.x // get the x-position
+            let y = e.y * Double(animator.phaseY)
             
             if x > chartXMax * animator.phaseX
             {
@@ -768,4 +744,51 @@ open class LineChartRenderer: LineRadarRenderer
         
         context.restoreGState()
     }
+
+    /// Creates a nested array of empty subarrays each of which will be populated with NSUIAccessibilityElements.
+    /// This is marked internal to support HorizontalBarChartRenderer as well.
+    private func accessibilityCreateEmptyOrderedElements() -> [[NSUIAccessibilityElement]]
+    {
+        guard let chart = dataProvider as? LineChartView else { return [] }
+
+        let dataSetCount = chart.lineData?.dataSetCount ?? 0
+
+        return Array(repeating: [NSUIAccessibilityElement](),
+                     count: dataSetCount)
+    }
+
+    /// Creates an NSUIAccessibleElement representing the smallest meaningful bar of the chart
+    /// i.e. in case of a stacked chart, this returns each stack, not the combined bar.
+    /// Note that it is marked internal to support subclass modification in the HorizontalBarChart.
+    private func createAccessibleElement(withIndex idx: Int,
+                                          container: LineChartView,
+                                          dataSet: ILineChartDataSet,
+                                          dataSetIndex: Int,
+                                          modifier: (NSUIAccessibilityElement) -> ()) -> NSUIAccessibilityElement
+    {
+        let element = NSUIAccessibilityElement(accessibilityContainer: container)
+        let xAxis = container.xAxis
+
+        guard let e = dataSet.entryForIndex(idx) else { return element }
+        guard let dataProvider = dataProvider else { return element }
+
+        // NOTE: The formatter can cause issues when the x-axis labels are consecutive ints.
+        // i.e. due to the Double conversion, if there are more than one data set that are grouped,
+        // there is the possibility of some labels being rounded up. A floor() might fix this, but seems to be a brute force solution.
+        let label = xAxis.valueFormatter?.stringForValue(e.x, axis: xAxis) ?? "\(e.x)"
+
+        let elementValueText = dataSet.valueFormatter?.stringForValue(e.y,
+                                                                      entry: e,
+                                                                      dataSetIndex: dataSetIndex,
+                                                                      viewPortHandler: viewPortHandler) ?? "\(e.y)"
+
+        let dataSetCount = dataProvider.lineData?.dataSetCount ?? -1
+        let doesContainMultipleDataSets = dataSetCount > 1
+
+        element.accessibilityLabel = "\(doesContainMultipleDataSets ? (dataSet.label ?? "")  + ", " : "") \(label): \(elementValueText)"
+
+        modifier(element)
+
+        return element
+    }
 }
diff --git a/Source/Charts/Renderers/LineRadarRenderer.swift b/Source/Charts/Renderers/LineRadarRenderer.swift
index d44a183562..6b02825053 100644
--- a/Source/Charts/Renderers/LineRadarRenderer.swift
+++ b/Source/Charts/Renderers/LineRadarRenderer.swift
@@ -15,16 +15,14 @@ import CoreGraphics
 @objc(LineRadarChartRenderer)
 open class LineRadarRenderer: LineScatterCandleRadarRenderer
 {
-    public override init(animator: Animator?, viewPortHandler: ViewPortHandler?)
+    public override init(animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
     }
     
     /// Draws the provided path in filled mode with the provided drawable.
-    open func drawFilledPath(context: CGContext, path: CGPath, fill: Fill, fillAlpha: CGFloat)
+    @objc open func drawFilledPath(context: CGContext, path: CGPath, fill: Fill, fillAlpha: CGFloat)
     {
-        guard let viewPortHandler = self.viewPortHandler
-            else { return }
         
         context.saveGState()
         context.beginPath()
@@ -39,7 +37,7 @@ open class LineRadarRenderer: LineScatterCandleRadarRenderer
     }
     
     /// Draws the provided path in filled mode with the provided color and alpha.
-    open func drawFilledPath(context: CGContext, path: CGPath, fillColor: NSUIColor, fillAlpha: CGFloat)
+    @objc open func drawFilledPath(context: CGContext, path: CGPath, fillColor: NSUIColor, fillAlpha: CGFloat)
     {
         context.saveGState()
         context.beginPath()
diff --git a/Source/Charts/Renderers/LineScatterCandleRadarRenderer.swift b/Source/Charts/Renderers/LineScatterCandleRadarRenderer.swift
index d4c993f64b..05203caf9c 100644
--- a/Source/Charts/Renderers/LineScatterCandleRadarRenderer.swift
+++ b/Source/Charts/Renderers/LineScatterCandleRadarRenderer.swift
@@ -15,7 +15,7 @@ import CoreGraphics
 @objc(LineScatterCandleRadarChartRenderer)
 open class LineScatterCandleRadarRenderer: BarLineScatterCandleBubbleRenderer
 {
-    public override init(animator: Animator?, viewPortHandler: ViewPortHandler?)
+    public override init(animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
     }
@@ -25,11 +25,8 @@ open class LineScatterCandleRadarRenderer: BarLineScatterCandleBubbleRenderer
     /// :param: points
     /// :param: horizontal
     /// :param: vertical
-    open func drawHighlightLines(context: CGContext, point: CGPoint, set: ILineScatterCandleRadarChartDataSet)
+    @objc open func drawHighlightLines(context: CGContext, point: CGPoint, set: ILineScatterCandleRadarChartDataSet)
     {
-        guard let
-            viewPortHandler = self.viewPortHandler
-            else { return }
         
         // draw vertical highlight lines
         if set.isVerticalHighlightIndicatorEnabled
diff --git a/Source/Charts/Renderers/PieChartRenderer.swift b/Source/Charts/Renderers/PieChartRenderer.swift
old mode 100755
new mode 100644
index 1127fe5357..0985a3da8d
--- a/Source/Charts/Renderers/PieChartRenderer.swift
+++ b/Source/Charts/Renderers/PieChartRenderer.swift
@@ -12,41 +12,45 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
 
 open class PieChartRenderer: DataRenderer
 {
-    open weak var chart: PieChartView?
-    
-    public init(chart: PieChartView?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc open weak var chart: PieChartView?
+
+    @objc public init(chart: PieChartView, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
-        
+
         self.chart = chart
     }
-    
+
     open override func drawData(context: CGContext)
     {
         guard let chart = chart else { return }
-        
+
         let pieData = chart.data
-        
+
         if pieData != nil
         {
+            // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+            accessibleChartElements.removeAll()
+
             for set in pieData!.dataSets as! [IPieChartDataSet]
+                where set.isVisible && set.entryCount > 0
             {
-                if set.isVisible && set.entryCount > 0
-                {
-                    drawDataSet(context: context, dataSet: set)
-                }
+                drawDataSet(context: context, dataSet: set)
             }
         }
     }
-    
-    open func calculateMinimumRadiusForSpacedSlice(
+
+    @objc open func calculateMinimumRadiusForSpacedSlice(
         center: CGPoint,
         radius: CGFloat,
         angle: CGFloat,
@@ -56,76 +60,72 @@ open class PieChartRenderer: DataRenderer
         sweepAngle: CGFloat) -> CGFloat
     {
         let angleMiddle = startAngle + sweepAngle / 2.0
-        
+
         // Other point of the arc
-        let arcEndPointX = center.x + radius * cos((startAngle + sweepAngle) * ChartUtils.Math.FDEG2RAD)
-        let arcEndPointY = center.y + radius * sin((startAngle + sweepAngle) * ChartUtils.Math.FDEG2RAD)
-        
+        let arcEndPointX = center.x + radius * cos((startAngle + sweepAngle).DEG2RAD)
+        let arcEndPointY = center.y + radius * sin((startAngle + sweepAngle).DEG2RAD)
+
         // Middle point on the arc
-        let arcMidPointX = center.x + radius * cos(angleMiddle * ChartUtils.Math.FDEG2RAD)
-        let arcMidPointY = center.y + radius * sin(angleMiddle * ChartUtils.Math.FDEG2RAD)
-        
+        let arcMidPointX = center.x + radius * cos(angleMiddle.DEG2RAD)
+        let arcMidPointY = center.y + radius * sin(angleMiddle.DEG2RAD)
+
         // This is the base of the contained triangle
         let basePointsDistance = sqrt(
             pow(arcEndPointX - arcStartPointX, 2) +
                 pow(arcEndPointY - arcStartPointY, 2))
-        
+
         // After reducing space from both sides of the "slice",
         //   the angle of the contained triangle should stay the same.
         // So let's find out the height of that triangle.
         let containedTriangleHeight = (basePointsDistance / 2.0 *
-            tan((180.0 - angle) / 2.0 * ChartUtils.Math.FDEG2RAD))
-        
+            tan((180.0 - angle).DEG2RAD / 2.0))
+
         // Now we subtract that from the radius
         var spacedRadius = radius - containedTriangleHeight
-        
+
         // And now subtract the height of the arc that's between the triangle and the outer circle
         spacedRadius -= sqrt(
             pow(arcMidPointX - (arcEndPointX + arcStartPointX) / 2.0, 2) +
                 pow(arcMidPointY - (arcEndPointY + arcStartPointY) / 2.0, 2))
-        
+
         return spacedRadius
     }
-    
+
     /// Calculates the sliceSpace to use based on visible values and their size compared to the set sliceSpace.
-    open func getSliceSpace(dataSet: IPieChartDataSet) -> CGFloat
+    @objc open func getSliceSpace(dataSet: IPieChartDataSet) -> CGFloat
     {
         guard
             dataSet.automaticallyDisableSliceSpacing,
-            let viewPortHandler = self.viewPortHandler,
             let data = chart?.data as? PieChartData
             else { return dataSet.sliceSpace }
-        
+
         let spaceSizeRatio = dataSet.sliceSpace / min(viewPortHandler.contentWidth, viewPortHandler.contentHeight)
         let minValueRatio = dataSet.yMin / data.yValueSum * 2.0
-        
+
         let sliceSpace = spaceSizeRatio > CGFloat(minValueRatio)
             ? 0.0
             : dataSet.sliceSpace
-        
+
         return sliceSpace
     }
 
-    open func drawDataSet(context: CGContext, dataSet: IPieChartDataSet)
+    @objc open func drawDataSet(context: CGContext, dataSet: IPieChartDataSet)
     {
-        guard
-            let chart = chart,
-            let animator = animator
-            else {return }
-        
+        guard let chart = chart else {return }
+
         var angle: CGFloat = 0.0
         let rotationAngle = chart.rotationAngle
-        
+
         let phaseX = animator.phaseX
         let phaseY = animator.phaseY
-        
+
         let entryCount = dataSet.entryCount
-        var drawAngles = chart.drawAngles
+        let drawAngles = chart.drawAngles
         let center = chart.centerCircleBox
         let radius = chart.radius
         let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled
         let userInnerRadius = drawInnerArc ? radius * chart.holeRadiusPercent : 0.0
-        
+
         var visibleAngleCount = 0
         for j in 0 ..< entryCount
         {
@@ -135,199 +135,234 @@ open class PieChartRenderer: DataRenderer
                 visibleAngleCount += 1
             }
         }
-        
+
         let sliceSpace = visibleAngleCount <= 1 ? 0.0 : getSliceSpace(dataSet: dataSet)
 
         context.saveGState()
-        
+
+        // Make the chart header the first element in the accessible elements array
+        // We can do this in drawDataSet, since we know PieChartView can have only 1 dataSet
+        // Also since there's only 1 dataset, we don't use the typical createAccessibleHeader() here.
+        // NOTE: - Since we want to summarize the total count of slices/portions/elements, use a default string here
+        // This is unlike when we are naming individual slices, wherein it's alright to not use a prefix as descriptor.
+        // i.e. We want to VO to say "3 Elements" even if the developer didn't specify an accessibility prefix
+        // If prefix is unspecified it is safe to assume they did not want to use "Element 1", so that uses a default empty string
+        let prefix: String = chart.data?.accessibilityEntryLabelPrefix ?? "Element"
+        let description = chart.chartDescription?.text ?? dataSet.label ?? chart.centerText ??  "Pie Chart"
+
+        let
+        element = NSUIAccessibilityElement(accessibilityContainer: chart)
+        element.accessibilityLabel = description + ". \(entryCount) \(prefix + (entryCount == 1 ? "" : "s"))"
+        element.accessibilityFrame = chart.bounds
+        element.isHeader = true
+        accessibleChartElements.append(element)
+
         for j in 0 ..< entryCount
         {
             let sliceAngle = drawAngles[j]
             var innerRadius = userInnerRadius
-            
+
             guard let e = dataSet.entryForIndex(j) else { continue }
             
+            defer
+            {
+                // From here on, even when skipping (i.e for highlight),
+                //  increase the angle
+                angle += sliceAngle * CGFloat(phaseX)
+            }
+
             // draw only if the value is greater than zero
-            if (abs(e.y) > Double.ulpOfOne)
+            if abs(e.y) < Double.ulpOfOne { continue }
+            
+            // Skip if highlighted
+            if dataSet.isHighlightEnabled && chart.needsHighlight(index: j)
+            {
+                continue
+            }
+        
+            let accountForSliceSpacing = sliceSpace > 0.0 && sliceAngle <= 180.0
+
+            context.setFillColor(dataSet.color(atIndex: j).cgColor)
+
+            let sliceSpaceAngleOuter = visibleAngleCount == 1 ?
+                0.0 :
+                sliceSpace / radius.DEG2RAD
+            let startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2.0) * CGFloat(phaseY)
+            var sweepAngleOuter = (sliceAngle - sliceSpaceAngleOuter) * CGFloat(phaseY)
+            if sweepAngleOuter < 0.0
+            {
+                sweepAngleOuter = 0.0
+            }
+
+            let arcStartPointX = center.x + radius * cos(startAngleOuter.DEG2RAD)
+            let arcStartPointY = center.y + radius * sin(startAngleOuter.DEG2RAD)
+
+            let path = CGMutablePath()
+
+            path.move(to: CGPoint(x: arcStartPointX,
+                                  y: arcStartPointY))
+
+            path.addRelativeArc(center: center, radius: radius, startAngle: startAngleOuter.DEG2RAD, delta: sweepAngleOuter.DEG2RAD)
+
+            if drawInnerArc &&
+                (innerRadius > 0.0 || accountForSliceSpacing)
             {
-                if !chart.needsHighlight(index: j)
+                if accountForSliceSpacing
                 {
-                    let accountForSliceSpacing = sliceSpace > 0.0 && sliceAngle <= 180.0
-                    
-                    context.setFillColor(dataSet.color(atIndex: j).cgColor)
-                    
-                    let sliceSpaceAngleOuter = visibleAngleCount == 1 ?
-                        0.0 :
-                        sliceSpace / (ChartUtils.Math.FDEG2RAD * radius)
-                    let startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2.0) * CGFloat(phaseY)
-                    var sweepAngleOuter = (sliceAngle - sliceSpaceAngleOuter) * CGFloat(phaseY)
-                    if sweepAngleOuter < 0.0
+                    var minSpacedRadius = calculateMinimumRadiusForSpacedSlice(
+                        center: center,
+                        radius: radius,
+                        angle: sliceAngle * CGFloat(phaseY),
+                        arcStartPointX: arcStartPointX,
+                        arcStartPointY: arcStartPointY,
+                        startAngle: startAngleOuter,
+                        sweepAngle: sweepAngleOuter)
+                    if minSpacedRadius < 0.0
                     {
-                        sweepAngleOuter = 0.0
+                        minSpacedRadius = -minSpacedRadius
                     }
-                    
-                    let arcStartPointX = center.x + radius * cos(startAngleOuter * ChartUtils.Math.FDEG2RAD)
-                    let arcStartPointY = center.y + radius * sin(startAngleOuter * ChartUtils.Math.FDEG2RAD)
+                    innerRadius = min(max(innerRadius, minSpacedRadius), radius)
+                }
 
-                    let path = CGMutablePath()
-                    
-                    path.move(to: CGPoint(x: arcStartPointX,
-                                          y: arcStartPointY))
-                    
-                    path.addRelativeArc(center: center, radius: radius, startAngle: startAngleOuter * ChartUtils.Math.FDEG2RAD, delta: sweepAngleOuter * ChartUtils.Math.FDEG2RAD)
+                let sliceSpaceAngleInner = visibleAngleCount == 1 || innerRadius == 0.0 ?
+                    0.0 :
+                    sliceSpace / innerRadius.DEG2RAD
+                let startAngleInner = rotationAngle + (angle + sliceSpaceAngleInner / 2.0) * CGFloat(phaseY)
+                var sweepAngleInner = (sliceAngle - sliceSpaceAngleInner) * CGFloat(phaseY)
+                if sweepAngleInner < 0.0
+                {
+                    sweepAngleInner = 0.0
+                }
+                let endAngleInner = startAngleInner + sweepAngleInner
 
-                    if drawInnerArc &&
-                        (innerRadius > 0.0 || accountForSliceSpacing)
-                    {
-                        if accountForSliceSpacing
-                        {
-                            var minSpacedRadius = calculateMinimumRadiusForSpacedSlice(
-                                center: center,
-                                radius: radius,
-                                angle: sliceAngle * CGFloat(phaseY),
-                                arcStartPointX: arcStartPointX,
-                                arcStartPointY: arcStartPointY,
-                                startAngle: startAngleOuter,
-                                sweepAngle: sweepAngleOuter)
-                            if minSpacedRadius < 0.0
-                            {
-                                minSpacedRadius = -minSpacedRadius
-                            }
-                            innerRadius = min(max(innerRadius, minSpacedRadius), radius)
-                        }
-                        
-                        let sliceSpaceAngleInner = visibleAngleCount == 1 || innerRadius == 0.0 ?
-                            0.0 :
-                            sliceSpace / (ChartUtils.Math.FDEG2RAD * innerRadius)
-                        let startAngleInner = rotationAngle + (angle + sliceSpaceAngleInner / 2.0) * CGFloat(phaseY)
-                        var sweepAngleInner = (sliceAngle - sliceSpaceAngleInner) * CGFloat(phaseY)
-                        if sweepAngleInner < 0.0
-                        {
-                            sweepAngleInner = 0.0
-                        }
-                        let endAngleInner = startAngleInner + sweepAngleInner
-                        
-                        path.addLine(
-                            to: CGPoint(
-                                x: center.x + innerRadius * cos(endAngleInner * ChartUtils.Math.FDEG2RAD),
-                                y: center.y + innerRadius * sin(endAngleInner * ChartUtils.Math.FDEG2RAD)))
-                        
-                        path.addRelativeArc(center: center, radius: innerRadius, startAngle: endAngleInner * ChartUtils.Math.FDEG2RAD, delta: -sweepAngleInner * ChartUtils.Math.FDEG2RAD)
-                    }
-                    else
-                    {
-                        if accountForSliceSpacing
-                        {
-                            let angleMiddle = startAngleOuter + sweepAngleOuter / 2.0
-                            
-                            let sliceSpaceOffset =
-                                calculateMinimumRadiusForSpacedSlice(
-                                    center: center,
-                                    radius: radius,
-                                    angle: sliceAngle * CGFloat(phaseY),
-                                    arcStartPointX: arcStartPointX,
-                                    arcStartPointY: arcStartPointY,
-                                    startAngle: startAngleOuter,
-                                    sweepAngle: sweepAngleOuter)
-
-                            let arcEndPointX = center.x + sliceSpaceOffset * cos(angleMiddle * ChartUtils.Math.FDEG2RAD)
-                            let arcEndPointY = center.y + sliceSpaceOffset * sin(angleMiddle * ChartUtils.Math.FDEG2RAD)
-                            
-                            path.addLine(
-                                to: CGPoint(
-                                    x: arcEndPointX,
-                                    y: arcEndPointY))
-                        }
-                        else
-                        {
-                            path.addLine(to: center)
-                        }
-                    }
-                    
-                    path.closeSubpath()
-                    
-                    context.beginPath()
-                    context.addPath(path)
-                    context.fillPath(using: .evenOdd)
+                path.addLine(
+                    to: CGPoint(
+                        x: center.x + innerRadius * cos(endAngleInner.DEG2RAD),
+                        y: center.y + innerRadius * sin(endAngleInner.DEG2RAD)))
+
+                path.addRelativeArc(center: center, radius: innerRadius, startAngle: endAngleInner.DEG2RAD, delta: -sweepAngleInner.DEG2RAD)
+            }
+            else
+            {
+                if accountForSliceSpacing
+                {
+                    let angleMiddle = startAngleOuter + sweepAngleOuter / 2.0
+
+                    let sliceSpaceOffset =
+                        calculateMinimumRadiusForSpacedSlice(
+                            center: center,
+                            radius: radius,
+                            angle: sliceAngle * CGFloat(phaseY),
+                            arcStartPointX: arcStartPointX,
+                            arcStartPointY: arcStartPointY,
+                            startAngle: startAngleOuter,
+                            sweepAngle: sweepAngleOuter)
+
+                    let arcEndPointX = center.x + sliceSpaceOffset * cos(angleMiddle.DEG2RAD)
+                    let arcEndPointY = center.y + sliceSpaceOffset * sin(angleMiddle.DEG2RAD)
+
+                    path.addLine(
+                        to: CGPoint(
+                            x: arcEndPointX,
+                            y: arcEndPointY))
+                }
+                else
+                {
+                    path.addLine(to: center)
                 }
             }
-            
-            angle += sliceAngle * CGFloat(phaseX)
+
+            path.closeSubpath()
+
+            context.beginPath()
+            context.addPath(path)
+            context.fillPath(using: .evenOdd)
+
+            let axElement = createAccessibleElement(withIndex: j,
+                                                    container: chart,
+                                                    dataSet: dataSet)
+            { (element) in
+                element.accessibilityFrame = path.boundingBoxOfPath
+            }
+
+            accessibleChartElements.append(axElement)
         }
-        
+
+        // Post this notification to let VoiceOver account for the redrawn frames
+        accessibilityPostLayoutChangedNotification()
+
         context.restoreGState()
     }
-    
+
     open override func drawValues(context: CGContext)
     {
         guard
             let chart = chart,
-            let data = chart.data,
-            let animator = animator
+            let data = chart.data
             else { return }
-        
+
         let center = chart.centerCircleBox
-        
+
         // get whole the radius
         let radius = chart.radius
         let rotationAngle = chart.rotationAngle
         var drawAngles = chart.drawAngles
         var absoluteAngles = chart.absoluteAngles
-        
+
         let phaseX = animator.phaseX
         let phaseY = animator.phaseY
-        
+
         var labelRadiusOffset = radius / 10.0 * 3.0
-        
+
         if chart.drawHoleEnabled
         {
             labelRadiusOffset = (radius - (radius * chart.holeRadiusPercent)) / 2.0
         }
-        
+
         let labelRadius = radius - labelRadiusOffset
-        
+
         var dataSets = data.dataSets
-        
+
         let yValueSum = (data as! PieChartData).yValueSum
-        
+
         let drawEntryLabels = chart.isDrawEntryLabelsEnabled
         let usePercentValuesEnabled = chart.usePercentValuesEnabled
         let entryLabelColor = chart.entryLabelColor
         let entryLabelFont = chart.entryLabelFont
-        
+
         var angle: CGFloat = 0.0
         var xIndex = 0
-        
+
         context.saveGState()
         defer { context.restoreGState() }
-        
+
         for i in 0 ..< dataSets.count
         {
             guard let dataSet = dataSets[i] as? IPieChartDataSet else { continue }
-            
+
             let drawValues = dataSet.isDrawValuesEnabled
-            
+
             if !drawValues && !drawEntryLabels && !dataSet.isDrawIconsEnabled
             {
                 continue
             }
-            
+
             let iconsOffset = dataSet.iconsOffset
-            
+
             let xValuePosition = dataSet.xValuePosition
             let yValuePosition = dataSet.yValuePosition
-            
+
             let valueFont = dataSet.valueFont
             let entryLabelFont = dataSet.entryLabelFont
             let lineHeight = valueFont.lineHeight
-            
+
             guard let formatter = dataSet.valueFormatter else { continue }
-            
+
             for j in 0 ..< dataSet.entryCount
             {
                 guard let e = dataSet.entryForIndex(j) else { continue }
                 let pe = e as? PieChartDataEntry
-                
+
                 if xIndex == 0
                 {
                     angle = 0.0
@@ -336,48 +371,48 @@ open class PieChartRenderer: DataRenderer
                 {
                     angle = absoluteAngles[xIndex - 1] * CGFloat(phaseX)
                 }
-                
+
                 let sliceAngle = drawAngles[xIndex]
                 let sliceSpace = getSliceSpace(dataSet: dataSet)
-                let sliceSpaceMiddleAngle = sliceSpace / (ChartUtils.Math.FDEG2RAD * labelRadius)
-                
+                let sliceSpaceMiddleAngle = sliceSpace / labelRadius.DEG2RAD
+
                 // offset needed to center the drawn text in the slice
                 let angleOffset = (sliceAngle - sliceSpaceMiddleAngle / 2.0) / 2.0
 
                 angle = angle + angleOffset
-                
+
                 let transformedAngle = rotationAngle + angle * CGFloat(phaseY)
-                
+
                 let value = usePercentValuesEnabled ? e.y / yValueSum * 100.0 : e.y
                 let valueText = formatter.stringForValue(
                     value,
                     entry: e,
                     dataSetIndex: i,
                     viewPortHandler: viewPortHandler)
-                
-                let sliceXBase = cos(transformedAngle * ChartUtils.Math.FDEG2RAD)
-                let sliceYBase = sin(transformedAngle * ChartUtils.Math.FDEG2RAD)
-                
+
+                let sliceXBase = cos(transformedAngle.DEG2RAD)
+                let sliceYBase = sin(transformedAngle.DEG2RAD)
+
                 let drawXOutside = drawEntryLabels && xValuePosition == .outsideSlice
                 let drawYOutside = drawValues && yValuePosition == .outsideSlice
                 let drawXInside = drawEntryLabels && xValuePosition == .insideSlice
                 let drawYInside = drawValues && yValuePosition == .insideSlice
-                
+
                 let valueTextColor = dataSet.valueTextColorAt(j)
                 let entryLabelColor = dataSet.entryLabelColor
-                
+
                 if drawXOutside || drawYOutside
                 {
                     let valueLineLength1 = dataSet.valueLinePart1Length
                     let valueLineLength2 = dataSet.valueLinePart2Length
                     let valueLinePart1OffsetPercentage = dataSet.valueLinePart1OffsetPercentage
-                    
+
                     var pt2: CGPoint
                     var labelPoint: CGPoint
                     var align: NSTextAlignment
-                    
+
                     var line1Radius: CGFloat
-                    
+
                     if chart.drawHoleEnabled
                     {
                         line1Radius = (radius - (radius * chart.holeRadiusPercent)) * valueLinePart1OffsetPercentage + (radius * chart.holeRadiusPercent)
@@ -386,19 +421,19 @@ open class PieChartRenderer: DataRenderer
                     {
                         line1Radius = radius * valueLinePart1OffsetPercentage
                     }
-                    
+
                     let polyline2Length = dataSet.valueLineVariableLength
-                        ? labelRadius * valueLineLength2 * abs(sin(transformedAngle * ChartUtils.Math.FDEG2RAD))
+                        ? labelRadius * valueLineLength2 * abs(sin(transformedAngle.DEG2RAD))
                         : labelRadius * valueLineLength2
-                    
+
                     let pt0 = CGPoint(
                         x: line1Radius * sliceXBase + center.x,
                         y: line1Radius * sliceYBase + center.y)
-                    
+
                     let pt1 = CGPoint(
                         x: labelRadius * (1 + valueLineLength1) * sliceXBase + center.x,
                         y: labelRadius * (1 + valueLineLength1) * sliceYBase + center.y)
-                    
+
                     if transformedAngle.truncatingRemainder(dividingBy: 360.0) >= 90.0 && transformedAngle.truncatingRemainder(dividingBy: 360.0) <= 270.0
                     {
                         pt2 = CGPoint(x: pt1.x - polyline2Length, y: pt1.y)
@@ -411,16 +446,27 @@ open class PieChartRenderer: DataRenderer
                         align = .left
                         labelPoint = CGPoint(x: pt2.x + 5, y: pt2.y - lineHeight)
                     }
-                    
-                    if dataSet.valueLineColor != nil
+
+                    DrawLine: do
                     {
-                        context.setStrokeColor(dataSet.valueLineColor!.cgColor)
+                        if dataSet.useValueColorForLine
+                        {
+                            context.setStrokeColor(dataSet.color(atIndex: j).cgColor)
+                        }
+                        else if let valueLineColor = dataSet.valueLineColor
+                        {
+                            context.setStrokeColor(valueLineColor.cgColor)
+                        }
+                        else
+                        {
+                            return
+                        }
                         context.setLineWidth(dataSet.valueLineWidth)
-                        
+
                         context.move(to: CGPoint(x: pt0.x, y: pt0.y))
                         context.addLine(to: CGPoint(x: pt1.x, y: pt1.y))
                         context.addLine(to: CGPoint(x: pt2.x, y: pt2.y))
-                        
+
                         context.drawPath(using: CGPathDrawingMode.stroke)
                     }
                     
@@ -431,9 +477,9 @@ open class PieChartRenderer: DataRenderer
                             text: valueText,
                             point: labelPoint,
                             align: align,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor]
+                            attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: valueTextColor]
                         )
-                        
+
                         if j < data.entryCount && pe?.label != nil
                         {
                             ChartUtils.drawText(
@@ -442,8 +488,8 @@ open class PieChartRenderer: DataRenderer
                                 point: CGPoint(x: labelPoint.x, y: labelPoint.y + lineHeight),
                                 align: align,
                                 attributes: [
-                                    NSFontAttributeName: entryLabelFont ?? valueFont,
-                                    NSForegroundColorAttributeName: entryLabelColor ?? valueTextColor]
+                                    NSAttributedString.Key.font: entryLabelFont ?? valueFont,
+                                    NSAttributedString.Key.foregroundColor: entryLabelColor ?? valueTextColor]
                             )
                         }
                     }
@@ -457,8 +503,8 @@ open class PieChartRenderer: DataRenderer
                                 point: CGPoint(x: labelPoint.x, y: labelPoint.y + lineHeight / 2.0),
                                 align: align,
                                 attributes: [
-                                    NSFontAttributeName: entryLabelFont ?? valueFont,
-                                    NSForegroundColorAttributeName: entryLabelColor ?? valueTextColor]
+                                    NSAttributedString.Key.font: entryLabelFont ?? valueFont,
+                                    NSAttributedString.Key.foregroundColor: entryLabelColor ?? valueTextColor]
                             )
                         }
                     }
@@ -469,17 +515,17 @@ open class PieChartRenderer: DataRenderer
                             text: valueText,
                             point: CGPoint(x: labelPoint.x, y: labelPoint.y + lineHeight / 2.0),
                             align: align,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor]
+                            attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: valueTextColor]
                         )
                     }
                 }
-                
+
                 if drawXInside || drawYInside
                 {
                     // calculate the text position
                     let x = labelRadius * sliceXBase + center.x
                     let y = labelRadius * sliceYBase + center.y - lineHeight
-                 
+
                     if drawXInside && drawYInside
                     {
                         ChartUtils.drawText(
@@ -487,9 +533,9 @@ open class PieChartRenderer: DataRenderer
                             text: valueText,
                             point: CGPoint(x: x, y: y),
                             align: .center,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor]
+                            attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: valueTextColor]
                         )
-                        
+
                         if j < data.entryCount && pe?.label != nil
                         {
                             ChartUtils.drawText(
@@ -498,8 +544,8 @@ open class PieChartRenderer: DataRenderer
                                 point: CGPoint(x: x, y: y + lineHeight),
                                 align: .center,
                                 attributes: [
-                                    NSFontAttributeName: entryLabelFont ?? valueFont,
-                                    NSForegroundColorAttributeName: entryLabelColor ?? valueTextColor]
+                                    NSAttributedString.Key.font: entryLabelFont ?? valueFont,
+                                    NSAttributedString.Key.foregroundColor: entryLabelColor ?? valueTextColor]
                             )
                         }
                     }
@@ -513,8 +559,8 @@ open class PieChartRenderer: DataRenderer
                                 point: CGPoint(x: x, y: y + lineHeight / 2.0),
                                 align: .center,
                                 attributes: [
-                                    NSFontAttributeName: entryLabelFont ?? valueFont,
-                                    NSForegroundColorAttributeName: entryLabelColor ?? valueTextColor]
+                                    NSAttributedString.Key.font: entryLabelFont ?? valueFont,
+                                    NSAttributedString.Key.foregroundColor: entryLabelColor ?? valueTextColor]
                             )
                         }
                     }
@@ -525,19 +571,19 @@ open class PieChartRenderer: DataRenderer
                             text: valueText,
                             point: CGPoint(x: x, y: y + lineHeight / 2.0),
                             align: .center,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: valueTextColor]
+                            attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: valueTextColor]
                         )
                     }
                 }
-                
+
                 if let icon = e.icon, dataSet.isDrawIconsEnabled
                 {
                     // calculate the icon's position
-                    
+
                     let x = (labelRadius + iconsOffset.y) * sliceXBase + center.x
                     var y = (labelRadius + iconsOffset.y) * sliceYBase + center.y
                     y += iconsOffset.x
-                    
+
                     ChartUtils.drawImage(context: context,
                                          image: icon,
                                          x: x,
@@ -549,29 +595,26 @@ open class PieChartRenderer: DataRenderer
             }
         }
     }
-    
+
     open override func drawExtras(context: CGContext)
     {
         drawHole(context: context)
         drawCenterText(context: context)
     }
-    
+
     /// draws the hole in the center of the chart and the transparent circle / hole
-    fileprivate func drawHole(context: CGContext)
+    private func drawHole(context: CGContext)
     {
-        guard
-            let chart = chart,
-            let animator = animator
-            else { return }
-        
+        guard let chart = chart else { return }
+
         if chart.drawHoleEnabled
         {
             context.saveGState()
-            
+
             let radius = chart.radius
             let holeRadius = radius * chart.holeRadiusPercent
             let center = chart.centerCircleBox
-            
+
             if let holeColor = chart.holeColor
             {
                 if holeColor != NSUIColor.clear
@@ -581,7 +624,7 @@ open class PieChartRenderer: DataRenderer
                     context.fillEllipse(in: CGRect(x: center.x - holeRadius, y: center.y - holeRadius, width: holeRadius * 2.0, height: holeRadius * 2.0))
                 }
             }
-            
+
             // only draw the circle if it can be seen (not covered by the hole)
             if let transparentCircleColor = chart.transparentCircleColor
             {
@@ -590,11 +633,11 @@ open class PieChartRenderer: DataRenderer
                 {
                     let alpha = animator.phaseX * animator.phaseY
                     let secondHoleRadius = radius * chart.transparentCircleRadiusPercent
-                    
+
                     // make transparent
                     context.setAlpha(CGFloat(alpha))
                     context.setFillColor(transparentCircleColor.cgColor)
-                    
+
                     // draw the transparent-circle
                     context.beginPath()
                     context.addEllipse(in: CGRect(
@@ -610,83 +653,85 @@ open class PieChartRenderer: DataRenderer
                     context.fillPath(using: .evenOdd)
                 }
             }
-            
+
             context.restoreGState()
         }
     }
-    
+
     /// draws the description text in the center of the pie chart makes most sense when center-hole is enabled
-    fileprivate func drawCenterText(context: CGContext)
+    private func drawCenterText(context: CGContext)
     {
         guard
             let chart = chart,
             let centerAttributedText = chart.centerAttributedText
             else { return }
-        
+
         if chart.drawCenterTextEnabled && centerAttributedText.length > 0
         {
             let center = chart.centerCircleBox
             let offset = chart.centerTextOffset
             let innerRadius = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled ? chart.radius * chart.holeRadiusPercent : chart.radius
-            
+
             let x = center.x + offset.x
             let y = center.y + offset.y
-            
+
             let holeRect = CGRect(
                 x: x - innerRadius,
                 y: y - innerRadius,
                 width: innerRadius * 2.0,
                 height: innerRadius * 2.0)
             var boundingRect = holeRect
-            
+
             if chart.centerTextRadiusPercent > 0.0
             {
                 boundingRect = boundingRect.insetBy(dx: (boundingRect.width - boundingRect.width * chart.centerTextRadiusPercent) / 2.0, dy: (boundingRect.height - boundingRect.height * chart.centerTextRadiusPercent) / 2.0)
             }
-            
+
             let textBounds = centerAttributedText.boundingRect(with: boundingRect.size, options: [.usesLineFragmentOrigin, .usesFontLeading, .truncatesLastVisibleLine], context: nil)
-            
+
             var drawingRect = boundingRect
             drawingRect.origin.x += (boundingRect.size.width - textBounds.size.width) / 2.0
             drawingRect.origin.y += (boundingRect.size.height - textBounds.size.height) / 2.0
             drawingRect.size = textBounds.size
-            
+
             context.saveGState()
 
             let clippingPath = CGPath(ellipseIn: holeRect, transform: nil)
             context.beginPath()
             context.addPath(clippingPath)
             context.clip()
-            
+
             centerAttributedText.draw(with: drawingRect, options: [.usesLineFragmentOrigin, .usesFontLeading, .truncatesLastVisibleLine], context: nil)
-            
+
             context.restoreGState()
         }
     }
-    
+
     open override func drawHighlighted(context: CGContext, indices: [Highlight])
     {
         guard
             let chart = chart,
-            let data = chart.data,
-            let animator = animator
+            let data = chart.data
             else { return }
-        
+
         context.saveGState()
-        
+
         let phaseX = animator.phaseX
         let phaseY = animator.phaseY
-        
+
         var angle: CGFloat = 0.0
         let rotationAngle = chart.rotationAngle
-        
-        var drawAngles = chart.drawAngles
-        var absoluteAngles = chart.absoluteAngles
+
+        let drawAngles = chart.drawAngles
+        let absoluteAngles = chart.absoluteAngles
         let center = chart.centerCircleBox
         let radius = chart.radius
         let drawInnerArc = chart.drawHoleEnabled && !chart.drawSlicesUnderHoleEnabled
         let userInnerRadius = drawInnerArc ? radius * chart.holeRadiusPercent : 0.0
-        
+
+        // Append highlighted accessibility slices into this array, so we can prioritize them over unselected slices
+        var highlightedAccessibleElements: [NSUIAccessibilityElement] = []
+
         for i in 0 ..< indices.count
         {
             // get the index to highlight
@@ -695,13 +740,10 @@ open class PieChartRenderer: DataRenderer
             {
                 continue
             }
-            
+
             guard let set = data.getDataSetByIndex(indices[i].dataSetIndex) as? IPieChartDataSet else { continue }
             
-            if !set.isHighlightEnabled
-            {
-                continue
-            }
+            if !set.isHighlightEnabled { continue }
 
             let entryCount = set.entryCount
             var visibleAngleCount = 0
@@ -713,7 +755,7 @@ open class PieChartRenderer: DataRenderer
                     visibleAngleCount += 1
                 }
             }
-            
+
             if index == 0
             {
                 angle = 0.0
@@ -722,49 +764,49 @@ open class PieChartRenderer: DataRenderer
             {
                 angle = absoluteAngles[index - 1] * CGFloat(phaseX)
             }
-            
+
             let sliceSpace = visibleAngleCount <= 1 ? 0.0 : set.sliceSpace
-            
+
             let sliceAngle = drawAngles[index]
             var innerRadius = userInnerRadius
-            
+
             let shift = set.selectionShift
             let highlightedRadius = radius + shift
-            
+
             let accountForSliceSpacing = sliceSpace > 0.0 && sliceAngle <= 180.0
-            
-            context.setFillColor(set.color(atIndex: index).cgColor)
-            
+
+            context.setFillColor(set.highlightColor?.cgColor ?? set.color(atIndex: index).cgColor)
+
             let sliceSpaceAngleOuter = visibleAngleCount == 1 ?
                 0.0 :
-                sliceSpace / (ChartUtils.Math.FDEG2RAD * radius)
-            
+                sliceSpace / radius.DEG2RAD
+
             let sliceSpaceAngleShifted = visibleAngleCount == 1 ?
                 0.0 :
-                sliceSpace / (ChartUtils.Math.FDEG2RAD * highlightedRadius)
-            
+                sliceSpace / highlightedRadius.DEG2RAD
+
             let startAngleOuter = rotationAngle + (angle + sliceSpaceAngleOuter / 2.0) * CGFloat(phaseY)
             var sweepAngleOuter = (sliceAngle - sliceSpaceAngleOuter) * CGFloat(phaseY)
             if sweepAngleOuter < 0.0
             {
                 sweepAngleOuter = 0.0
             }
-            
+
             let startAngleShifted = rotationAngle + (angle + sliceSpaceAngleShifted / 2.0) * CGFloat(phaseY)
             var sweepAngleShifted = (sliceAngle - sliceSpaceAngleShifted) * CGFloat(phaseY)
             if sweepAngleShifted < 0.0
             {
                 sweepAngleShifted = 0.0
             }
-            
+
             let path = CGMutablePath()
-            
-            path.move(to: CGPoint(x: center.x + highlightedRadius * cos(startAngleShifted * ChartUtils.Math.FDEG2RAD),
-                                  y: center.y + highlightedRadius * sin(startAngleShifted * ChartUtils.Math.FDEG2RAD)))
-            
-            path.addRelativeArc(center: center, radius: highlightedRadius, startAngle: startAngleShifted * ChartUtils.Math.FDEG2RAD,
-                                delta: sweepAngleShifted * ChartUtils.Math.FDEG2RAD)
-            
+
+            path.move(to: CGPoint(x: center.x + highlightedRadius * cos(startAngleShifted.DEG2RAD),
+                                  y: center.y + highlightedRadius * sin(startAngleShifted.DEG2RAD)))
+
+            path.addRelativeArc(center: center, radius: highlightedRadius, startAngle: startAngleShifted.DEG2RAD,
+                                delta: sweepAngleShifted.DEG2RAD)
+
             var sliceSpaceRadius: CGFloat = 0.0
             if accountForSliceSpacing
             {
@@ -772,12 +814,12 @@ open class PieChartRenderer: DataRenderer
                     center: center,
                     radius: radius,
                     angle: sliceAngle * CGFloat(phaseY),
-                    arcStartPointX: center.x + radius * cos(startAngleOuter * ChartUtils.Math.FDEG2RAD),
-                    arcStartPointY: center.y + radius * sin(startAngleOuter * ChartUtils.Math.FDEG2RAD),
+                    arcStartPointX: center.x + radius * cos(startAngleOuter.DEG2RAD),
+                    arcStartPointY: center.y + radius * sin(startAngleOuter.DEG2RAD),
                     startAngle: startAngleOuter,
                     sweepAngle: sweepAngleOuter)
             }
-            
+
             if drawInnerArc &&
                 (innerRadius > 0.0 || accountForSliceSpacing)
             {
@@ -790,10 +832,10 @@ open class PieChartRenderer: DataRenderer
                     }
                     innerRadius = min(max(innerRadius, minSpacedRadius), radius)
                 }
-                
+
                 let sliceSpaceAngleInner = visibleAngleCount == 1 || innerRadius == 0.0 ?
                     0.0 :
-                    sliceSpace / (ChartUtils.Math.FDEG2RAD * innerRadius)
+                    sliceSpace / innerRadius.DEG2RAD
                 let startAngleInner = rotationAngle + (angle + sliceSpaceAngleInner / 2.0) * CGFloat(phaseY)
                 var sweepAngleInner = (sliceAngle - sliceSpaceAngleInner) * CGFloat(phaseY)
                 if sweepAngleInner < 0.0
@@ -801,25 +843,25 @@ open class PieChartRenderer: DataRenderer
                     sweepAngleInner = 0.0
                 }
                 let endAngleInner = startAngleInner + sweepAngleInner
-                
+
                 path.addLine(
                     to: CGPoint(
-                        x: center.x + innerRadius * cos(endAngleInner * ChartUtils.Math.FDEG2RAD),
-                        y: center.y + innerRadius * sin(endAngleInner * ChartUtils.Math.FDEG2RAD)))
-                
+                        x: center.x + innerRadius * cos(endAngleInner.DEG2RAD),
+                        y: center.y + innerRadius * sin(endAngleInner.DEG2RAD)))
+
                 path.addRelativeArc(center: center, radius: innerRadius,
-                                    startAngle: endAngleInner * ChartUtils.Math.FDEG2RAD,
-                                    delta: -sweepAngleInner * ChartUtils.Math.FDEG2RAD)
+                                    startAngle: endAngleInner.DEG2RAD,
+                                    delta: -sweepAngleInner.DEG2RAD)
             }
             else
             {
                 if accountForSliceSpacing
                 {
                     let angleMiddle = startAngleOuter + sweepAngleOuter / 2.0
-                    
-                    let arcEndPointX = center.x + sliceSpaceRadius * cos(angleMiddle * ChartUtils.Math.FDEG2RAD)
-                    let arcEndPointY = center.y + sliceSpaceRadius * sin(angleMiddle * ChartUtils.Math.FDEG2RAD)
-                    
+
+                    let arcEndPointX = center.x + sliceSpaceRadius * cos(angleMiddle.DEG2RAD)
+                    let arcEndPointY = center.y + sliceSpaceRadius * sin(angleMiddle.DEG2RAD)
+
                     path.addLine(
                         to: CGPoint(
                             x: arcEndPointX,
@@ -830,14 +872,72 @@ open class PieChartRenderer: DataRenderer
                     path.addLine(to: center)
                 }
             }
-            
+
             path.closeSubpath()
-            
+
             context.beginPath()
             context.addPath(path)
             context.fillPath(using: .evenOdd)
+
+            let axElement = createAccessibleElement(withIndex: index,
+                                                    container: chart,
+                                                    dataSet: set)
+            { (element) in
+                element.accessibilityFrame = path.boundingBoxOfPath
+                element.isSelected = true
+            }
+
+            highlightedAccessibleElements.append(axElement)
         }
-        
+
+        // Prepend selected slices before the already rendered unselected ones.
+        // NOTE: - This relies on drawDataSet() being called before drawHighlighted in PieChartView.
+        if !accessibleChartElements.isEmpty {
+            accessibleChartElements.insert(contentsOf: highlightedAccessibleElements, at: 1)
+        }
+
         context.restoreGState()
     }
+
+    /// Creates an NSUIAccessibilityElement representing a slice of the PieChart.
+    /// The element only has it's container and label set based on the chart and dataSet. Use the modifier to alter traits and frame.
+    private func createAccessibleElement(withIndex idx: Int,
+                                         container: PieChartView,
+                                         dataSet: IPieChartDataSet,
+                                         modifier: (NSUIAccessibilityElement) -> ()) -> NSUIAccessibilityElement {
+
+        let element = NSUIAccessibilityElement(accessibilityContainer: container)
+
+        guard let e = dataSet.entryForIndex(idx) else { return element }
+        guard let formatter = dataSet.valueFormatter else { return element }
+        guard let data = container.data as? PieChartData else { return element }
+
+        var elementValueText = formatter.stringForValue(
+            e.y,
+            entry: e,
+            dataSetIndex: idx,
+            viewPortHandler: viewPortHandler)
+
+        if container.usePercentValuesEnabled {
+            let value = e.y / data.yValueSum * 100.0
+            let valueText = formatter.stringForValue(
+                value,
+                entry: e,
+                dataSetIndex: idx,
+                viewPortHandler: viewPortHandler)
+
+            elementValueText = valueText
+        }
+
+        let pieChartDataEntry = (dataSet.entryForIndex(idx) as? PieChartDataEntry)
+        let isCount = data.accessibilityEntryLabelSuffixIsCount
+        let prefix = data.accessibilityEntryLabelPrefix?.appending("\(idx + 1)") ?? pieChartDataEntry?.label ?? ""
+        let suffix = data.accessibilityEntryLabelSuffix ?? ""
+        element.accessibilityLabel = "\(prefix) : \(elementValueText) \(suffix  + (isCount ? (e.y == 1.0 ? "" : "s") : "") )"
+
+        // The modifier allows changing of traits and frame depending on highlight, rotation, etc
+        modifier(element)
+
+        return element
+    }
 }
diff --git a/Source/Charts/Renderers/RadarChartRenderer.swift b/Source/Charts/Renderers/RadarChartRenderer.swift
index 96dfb16412..c2ab79fcc2 100644
--- a/Source/Charts/Renderers/RadarChartRenderer.swift
+++ b/Source/Charts/Renderers/RadarChartRenderer.swift
@@ -12,16 +12,21 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
-
 open class RadarChartRenderer: LineRadarRenderer
 {
-    open weak var chart: RadarChartView?
+    private lazy var accessibilityXLabels: [String] = {
+        guard let chart = chart else { return [] }
+        guard let formatter = chart.xAxis.valueFormatter else { return [] }
+
+        let maxEntryCount = chart.data?.maxEntryCountSet?.entryCount ?? 0
+        return stride(from: 0, to: maxEntryCount, by: 1).map {
+            formatter.stringForValue(Double($0), axis: chart.xAxis)
+        }
+    }()
+
+    @objc open weak var chart: RadarChartView?
 
-    public init(chart: RadarChartView?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc public init(chart: RadarChartView, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
         
@@ -37,28 +42,34 @@ open class RadarChartRenderer: LineRadarRenderer
         if radarData != nil
         {
             let mostEntries = radarData?.maxEntryCountSet?.entryCount ?? 0
-            
-            for set in radarData!.dataSets as! [IRadarChartDataSet]
+
+            // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+            self.accessibleChartElements.removeAll()
+
+            // Make the chart header the first element in the accessible elements array
+            if let accessibilityHeaderData = radarData as? RadarChartData {
+                let element = createAccessibleHeader(usingChart: chart,
+                                                     andData: accessibilityHeaderData,
+                                                     withDefaultDescription: "Radar Chart")
+                self.accessibleChartElements.append(element)
+            }
+
+            for set in radarData!.dataSets as! [IRadarChartDataSet] where set.isVisible
             {
-                if set.isVisible
-                {
-                    drawDataSet(context: context, dataSet: set, mostEntries: mostEntries)
-                }
+                drawDataSet(context: context, dataSet: set, mostEntries: mostEntries)
             }
         }
     }
     
     /// Draws the RadarDataSet
     ///
-    /// - parameter context:
-    /// - parameter dataSet:
-    /// - parameter mostEntries: the entry count of the dataset with the most entries
+    /// - Parameters:
+    ///   - context:
+    ///   - dataSet:
+    ///   - mostEntries: the entry count of the dataset with the most entries
     internal func drawDataSet(context: CGContext, dataSet: IRadarChartDataSet, mostEntries: Int)
     {
-        guard let
-            chart = chart,
-            let animator = animator
-            else { return }
+        guard let chart = chart else { return }
         
         context.saveGState()
         
@@ -74,15 +85,26 @@ open class RadarChartRenderer: LineRadarRenderer
         let entryCount = dataSet.entryCount
         let path = CGMutablePath()
         var hasMovedToPoint = false
-        
+
+        let prefix: String = chart.data?.accessibilityEntryLabelPrefix ?? "Item"
+        let description = dataSet.label ?? ""
+
+        // Make a tuple of (xLabels, value, originalIndex) then sort it
+        // This is done, so that the labels are narrated in decreasing order of their corresponding value
+        // Otherwise, there is no non-visual logic to the data presented
+        let accessibilityEntryValues =  Array(0 ..< entryCount).map { (dataSet.entryForIndex($0)?.y ?? 0, $0) }
+        let accessibilityAxisLabelValueTuples = zip(accessibilityXLabels, accessibilityEntryValues).map { ($0, $1.0, $1.1) }.sorted { $0.1 > $1.1 }
+        let accessibilityDataSetDescription: String = description + ". \(entryCount) \(prefix + (entryCount == 1 ? "" : "s")). "
+        let accessibilityFrameWidth: CGFloat = 22.0 // To allow a tap target of 44x44
+
+        var accessibilityEntryElements: [NSUIAccessibilityElement] = []
+
         for j in 0 ..< entryCount
         {
             guard let e = dataSet.entryForIndex(j) else { continue }
             
-            let p = ChartUtils.getPosition(
-                center: center,
-                dist: CGFloat((e.y - chart.chartYMin) * Double(factor) * phaseY),
-                angle: sliceangle * CGFloat(j) * CGFloat(phaseX) + chart.rotationAngle)
+            let p = center.moving(distance: CGFloat((e.y - chart.chartYMin) * Double(factor) * phaseY),
+                                  atAngle: sliceangle * CGFloat(j) * CGFloat(phaseX) + chart.rotationAngle)
             
             if p.x.isNaN
             {
@@ -98,6 +120,26 @@ open class RadarChartRenderer: LineRadarRenderer
             {
                 path.addLine(to: p)
             }
+
+            let accessibilityLabel = accessibilityAxisLabelValueTuples[j].0
+            let accessibilityValue = accessibilityAxisLabelValueTuples[j].1
+            let accessibilityValueIndex = accessibilityAxisLabelValueTuples[j].2
+
+            let axp = center.moving(distance: CGFloat((accessibilityValue - chart.chartYMin) * Double(factor) * phaseY),
+                                    atAngle: sliceangle * CGFloat(accessibilityValueIndex) * CGFloat(phaseX) + chart.rotationAngle)
+
+            let axDescription = description + " - " + accessibilityLabel + ": \(accessibilityValue) \(chart.data?.accessibilityEntryLabelSuffix ?? "")"
+            let axElement = createAccessibleElement(withDescription: axDescription,
+                                                    container: chart,
+                                                    dataSet: dataSet)
+            { (element) in
+                element.accessibilityFrame = CGRect(x: axp.x - accessibilityFrameWidth,
+                                                    y: axp.y - accessibilityFrameWidth,
+                                                    width: 2 * accessibilityFrameWidth,
+                                                    height: 2 * accessibilityFrameWidth)
+            }
+
+            accessibilityEntryElements.append(axElement)
         }
         
         // if this is the largest set, close it
@@ -128,12 +170,25 @@ open class RadarChartRenderer: LineRadarRenderer
             context.setStrokeColor(dataSet.color(atIndex: 0).cgColor)
             context.setLineWidth(dataSet.lineWidth)
             context.setAlpha(1.0)
-            
+
             context.beginPath()
             context.addPath(path)
             context.strokePath()
+
+            let axElement = createAccessibleElement(withDescription: accessibilityDataSetDescription,
+                                                    container: chart,
+                                                    dataSet: dataSet)
+            { (element) in
+                element.isHeader = true
+                element.accessibilityFrame = path.boundingBoxOfPath
+            }
+
+            accessibleChartElements.append(axElement)
+            accessibleChartElements.append(contentsOf: accessibilityEntryElements)
         }
         
+        accessibilityPostLayoutChangedNotification()
+
         context.restoreGState()
     }
     
@@ -141,8 +196,7 @@ open class RadarChartRenderer: LineRadarRenderer
     {
         guard
             let chart = chart,
-            let data = chart.data,
-            let animator = animator
+            let data = chart.data
             else { return }
         
         let phaseX = animator.phaseX
@@ -159,12 +213,10 @@ open class RadarChartRenderer: LineRadarRenderer
         
         for i in 0 ..< data.dataSetCount
         {
-            let dataSet = data.getDataSetByIndex(i) as! IRadarChartDataSet
-            
-            if !shouldDrawValues(forDataSet: dataSet)
-            {
-                continue
-            }
+            guard let
+                dataSet = data.getDataSetByIndex(i) as? IRadarChartDataSet,
+                shouldDrawValues(forDataSet: dataSet)
+                else { continue }
             
             let entryCount = dataSet.entryCount
             
@@ -174,10 +226,8 @@ open class RadarChartRenderer: LineRadarRenderer
             {
                 guard let e = dataSet.entryForIndex(j) else { continue }
                 
-                let p = ChartUtils.getPosition(
-                    center: center,
-                    dist: CGFloat(e.y - chart.chartYMin) * factor * CGFloat(phaseY),
-                    angle: sliceangle * CGFloat(j) * CGFloat(phaseX) + chart.rotationAngle)
+                let p = center.moving(distance: CGFloat(e.y - chart.chartYMin) * factor * CGFloat(phaseY),
+                                      atAngle: sliceangle * CGFloat(j) * CGFloat(phaseX) + chart.rotationAngle)
                 
                 let valueFont = dataSet.valueFont
                 
@@ -194,17 +244,15 @@ open class RadarChartRenderer: LineRadarRenderer
                             viewPortHandler: viewPortHandler),
                         point: CGPoint(x: p.x, y: p.y - yoffset - valueFont.lineHeight),
                         align: .center,
-                        attributes: [NSFontAttributeName: valueFont,
-                            NSForegroundColorAttributeName: dataSet.valueTextColorAt(j)]
+                        attributes: [NSAttributedString.Key.font: valueFont,
+                            NSAttributedString.Key.foregroundColor: dataSet.valueTextColorAt(j)]
                     )
                 }
                 
                 if let icon = e.icon, dataSet.isDrawIconsEnabled
                 {
-                    var pIcon = ChartUtils.getPosition(
-                        center: center,
-                        dist: CGFloat(e.y) * factor * CGFloat(phaseY) + iconsOffset.y,
-                        angle: sliceangle * CGFloat(j) * CGFloat(phaseX) + chart.rotationAngle)
+                    var pIcon = center.moving(distance: CGFloat(e.y) * factor * CGFloat(phaseY) + iconsOffset.y,
+                                              atAngle: sliceangle * CGFloat(j) * CGFloat(phaseX) + chart.rotationAngle)
                     pIcon.y += iconsOffset.x
                     
                     ChartUtils.drawImage(context: context,
@@ -222,9 +270,9 @@ open class RadarChartRenderer: LineRadarRenderer
         drawWeb(context: context)
     }
     
-    fileprivate var _webLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _webLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
     
-    open func drawWeb(context: CGContext)
+    @objc open func drawWeb(context: CGContext)
     {
         guard
             let chart = chart,
@@ -252,10 +300,8 @@ open class RadarChartRenderer: LineRadarRenderer
 
         for i in stride(from: 0, to: maxEntryCount, by: xIncrements)
         {
-            let p = ChartUtils.getPosition(
-                center: center,
-                dist: CGFloat(chart.yRange) * factor,
-                angle: sliceangle * CGFloat(i) + rotationangle)
+            let p = center.moving(distance: CGFloat(chart.yRange) * factor,
+                                  atAngle: sliceangle * CGFloat(i) + rotationangle)
             
             _webLineSegmentsBuffer[0].x = center.x
             _webLineSegmentsBuffer[0].y = center.y
@@ -278,8 +324,8 @@ open class RadarChartRenderer: LineRadarRenderer
             {
                 let r = CGFloat(chart.yAxis.entries[j] - chart.chartYMin) * factor
 
-                let p1 = ChartUtils.getPosition(center: center, dist: r, angle: sliceangle * CGFloat(i) + rotationangle)
-                let p2 = ChartUtils.getPosition(center: center, dist: r, angle: sliceangle * CGFloat(i + 1) + rotationangle)
+                let p1 = center.moving(distance: r, atAngle: sliceangle * CGFloat(i) + rotationangle)
+                let p2 = center.moving(distance: r, atAngle: sliceangle * CGFloat(i + 1) + rotationangle)
                 
                 _webLineSegmentsBuffer[0].x = p1.x
                 _webLineSegmentsBuffer[0].y = p1.y
@@ -293,14 +339,13 @@ open class RadarChartRenderer: LineRadarRenderer
         context.restoreGState()
     }
     
-    fileprivate var _highlightPointBuffer = CGPoint()
+    private var _highlightPointBuffer = CGPoint()
 
     open override func drawHighlighted(context: CGContext, indices: [Highlight])
     {
         guard
             let chart = chart,
-            let radarData = chart.data as? RadarChartData,
-            let animator = animator
+            let radarData = chart.data as? RadarChartData
             else { return }
         
         context.saveGState()
@@ -341,10 +386,8 @@ open class RadarChartRenderer: LineRadarRenderer
             
             let y = e.y - chart.chartYMin
             
-            _highlightPointBuffer = ChartUtils.getPosition(
-                center: center,
-                dist: CGFloat(y) * factor * CGFloat(animator.phaseY),
-                angle: sliceangle * CGFloat(high.x) * CGFloat(animator.phaseX) + chart.rotationAngle)
+            _highlightPointBuffer = center.moving(distance: CGFloat(y) * factor * CGFloat(animator.phaseY),
+                                                  atAngle: sliceangle * CGFloat(high.x) * CGFloat(animator.phaseX) + chart.rotationAngle)
             
             high.setDraw(pt: _highlightPointBuffer)
             
@@ -415,4 +458,18 @@ open class RadarChartRenderer: LineRadarRenderer
         
         context.restoreGState()
     }
+
+    private func createAccessibleElement(withDescription description: String,
+                                         container: RadarChartView,
+                                         dataSet: IRadarChartDataSet,
+                                         modifier: (NSUIAccessibilityElement) -> ()) -> NSUIAccessibilityElement {
+
+        let element = NSUIAccessibilityElement(accessibilityContainer: container)
+        element.accessibilityLabel = description
+
+        // The modifier allows changing of traits and frame depending on highlight, rotation, etc
+        modifier(element)
+
+        return element
+    }
 }
diff --git a/Source/Charts/Renderers/Renderer.swift b/Source/Charts/Renderers/Renderer.swift
index fcca54ab5e..e57a9b853f 100644
--- a/Source/Charts/Renderers/Renderer.swift
+++ b/Source/Charts/Renderers/Renderer.swift
@@ -16,17 +16,11 @@ import CoreGraphics
 open class Renderer: NSObject
 {
     /// the component that handles the drawing area of the chart and it's offsets
-    open var viewPortHandler: ViewPortHandler?
-    
-    public override init()
-    {
-        super.init()
-    }
-    
-    public init(viewPortHandler: ViewPortHandler?)
+    @objc public let viewPortHandler: ViewPortHandler
+
+    @objc public init(viewPortHandler: ViewPortHandler)
     {
-        super.init()
         self.viewPortHandler = viewPortHandler
+        super.init()
     }
 }
-        
diff --git a/Source/Charts/Renderers/Scatter/ChevronDownShapeRenderer.swift b/Source/Charts/Renderers/Scatter/ChevronDownShapeRenderer.swift
index ef4d26ed2c..2d035bf357 100644
--- a/Source/Charts/Renderers/Scatter/ChevronDownShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/ChevronDownShapeRenderer.swift
@@ -9,6 +9,7 @@
 //  https://github.com/danielgindi/Charts
 //
 import Foundation
+import CoreGraphics
 
 open class ChevronDownShapeRenderer : NSObject, IShapeRenderer
 {
diff --git a/Source/Charts/Renderers/Scatter/ChevronUpShapeRenderer.swift b/Source/Charts/Renderers/Scatter/ChevronUpShapeRenderer.swift
index a0b9f36c68..725533e780 100644
--- a/Source/Charts/Renderers/Scatter/ChevronUpShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/ChevronUpShapeRenderer.swift
@@ -9,6 +9,7 @@
 //  https://github.com/danielgindi/Charts
 //
 import Foundation
+import CoreGraphics
 
 open class ChevronUpShapeRenderer : NSObject, IShapeRenderer
 {
diff --git a/Source/Charts/Renderers/Scatter/CircleShapeRenderer.swift b/Source/Charts/Renderers/Scatter/CircleShapeRenderer.swift
index ed8a25655b..b94a51137a 100644
--- a/Source/Charts/Renderers/Scatter/CircleShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/CircleShapeRenderer.swift
@@ -9,6 +9,7 @@
 //  https://github.com/danielgindi/Charts
 //
 import Foundation
+import CoreGraphics
 
 open class CircleShapeRenderer : NSObject, IShapeRenderer
 {
diff --git a/Source/Charts/Renderers/Scatter/CrossShapeRenderer.swift b/Source/Charts/Renderers/Scatter/CrossShapeRenderer.swift
index 571ea1132f..18785d3dee 100644
--- a/Source/Charts/Renderers/Scatter/CrossShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/CrossShapeRenderer.swift
@@ -9,6 +9,7 @@
 //  https://github.com/danielgindi/Charts
 //
 import Foundation
+import CoreGraphics
 
 open class CrossShapeRenderer : NSObject, IShapeRenderer
 {
diff --git a/Source/Charts/Renderers/Scatter/IShapeRenderer.swift b/Source/Charts/Renderers/Scatter/IShapeRenderer.swift
index 51578a99ba..ff12ee3fb2 100644
--- a/Source/Charts/Renderers/Scatter/IShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/IShapeRenderer.swift
@@ -10,17 +10,19 @@
 //
 
 import Foundation
+import CoreGraphics
 
 @objc
-public protocol IShapeRenderer : NSObjectProtocol
+public protocol IShapeRenderer: class
 {
     /// Renders the provided ScatterDataSet with a shape.
     ///
-    /// - parameter context:         CGContext for drawing on
-    /// - parameter dataSet:         The DataSet to be drawn
-    /// - parameter viewPortHandler: Contains information about the current state of the view
-    /// - parameter point:           Position to draw the shape at
-    /// - parameter color:           Color to draw the shape
+    /// - Parameters:
+    ///   - context:         CGContext for drawing on
+    ///   - dataSet:         The DataSet to be drawn
+    ///   - viewPortHandler: Contains information about the current state of the view
+    ///   - point:           Position to draw the shape at
+    ///   - color:           Color to draw the shape
     func renderShape(
         context: CGContext,
         dataSet: IScatterChartDataSet,
diff --git a/Source/Charts/Renderers/Scatter/SquareShapeRenderer.swift b/Source/Charts/Renderers/Scatter/SquareShapeRenderer.swift
index 892068ff79..ea692e33fd 100644
--- a/Source/Charts/Renderers/Scatter/SquareShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/SquareShapeRenderer.swift
@@ -9,6 +9,7 @@
 //  https://github.com/danielgindi/Charts
 //
 import Foundation
+import CoreGraphics
 
 open class SquareShapeRenderer : NSObject, IShapeRenderer
 {
diff --git a/Source/Charts/Renderers/Scatter/TriangleShapeRenderer.swift b/Source/Charts/Renderers/Scatter/TriangleShapeRenderer.swift
index 4847c00cde..fa313b765b 100644
--- a/Source/Charts/Renderers/Scatter/TriangleShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/TriangleShapeRenderer.swift
@@ -9,6 +9,7 @@
 //  https://github.com/danielgindi/Charts
 //
 import Foundation
+import CoreGraphics
 
 open class TriangleShapeRenderer : NSObject, IShapeRenderer
 {
diff --git a/Source/Charts/Renderers/Scatter/XShapeRenderer.swift b/Source/Charts/Renderers/Scatter/XShapeRenderer.swift
index 1f8c617fbe..8a546c5f0b 100644
--- a/Source/Charts/Renderers/Scatter/XShapeRenderer.swift
+++ b/Source/Charts/Renderers/Scatter/XShapeRenderer.swift
@@ -9,6 +9,7 @@
 //  https://github.com/danielgindi/Charts
 //
 import Foundation
+import CoreGraphics
 
 open class XShapeRenderer : NSObject, IShapeRenderer
 {
diff --git a/Source/Charts/Renderers/ScatterChartRenderer.swift b/Source/Charts/Renderers/ScatterChartRenderer.swift
index 4c6a0be213..57d348b28b 100644
--- a/Source/Charts/Renderers/ScatterChartRenderer.swift
+++ b/Source/Charts/Renderers/ScatterChartRenderer.swift
@@ -12,26 +12,35 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
-
 open class ScatterChartRenderer: LineScatterCandleRadarRenderer
 {
-    open weak var dataProvider: ScatterChartDataProvider?
+    @objc open weak var dataProvider: ScatterChartDataProvider?
     
-    public init(dataProvider: ScatterChartDataProvider?, animator: Animator?, viewPortHandler: ViewPortHandler?)
+    @objc public init(dataProvider: ScatterChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
     {
         super.init(animator: animator, viewPortHandler: viewPortHandler)
         
         self.dataProvider = dataProvider
     }
-    
+
     open override func drawData(context: CGContext)
     {
         guard let scatterData = dataProvider?.scatterData else { return }
+
+        // If we redraw the data, remove and repopulate accessible elements to update label values and frames
+        accessibleChartElements.removeAll()
         
+        if let chart = dataProvider as? ScatterChartView {
+            // Make the chart header the first element in the accessible elements array
+            let element = createAccessibleHeader(usingChart: chart,
+                                                 andData: scatterData,
+                                                 withDefaultDescription: "Scatter Chart")
+            accessibleChartElements.append(element)
+        }
+
+        // TODO: Due to the potential complexity of data presented in Scatter charts, a more usable way
+        // for VO accessibility would be to use axis based traversal rather than by dataset.
+        // Hence, accessibleChartElements is not populated below. (Individual renderers guard against dataSource being their respective views)
         for i in 0 ..< scatterData.dataSetCount
         {
             guard let set = scatterData.getDataSetByIndex(i) else { continue }
@@ -48,15 +57,11 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
         }
     }
     
-    fileprivate var _lineSegments = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _lineSegments = [CGPoint](repeating: CGPoint(), count: 2)
     
-    open func drawDataSet(context: CGContext, dataSet: IScatterChartDataSet)
+    @objc open func drawDataSet(context: CGContext, dataSet: IScatterChartDataSet)
     {
-        guard
-            let dataProvider = dataProvider,
-            let animator = animator,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let dataProvider = dataProvider else { return }
         
         let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
         
@@ -106,9 +111,7 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
     {
         guard
             let dataProvider = dataProvider,
-            let scatterData = dataProvider.scatterData,
-            let animator = animator,
-            let viewPortHandler = self.viewPortHandler
+            let scatterData = dataProvider.scatterData
             else { return }
         
         // if values are drawn
@@ -123,16 +126,13 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
             for i in 0 ..< scatterData.dataSetCount
             {
                 let dataSet = dataSets[i]
-                
-                if !shouldDrawValues(forDataSet: dataSet)
-                {
-                    continue
-                }
+                guard let
+                    formatter = dataSet.valueFormatter,
+                    shouldDrawValues(forDataSet: dataSet)
+                    else { continue }
                 
                 let valueFont = dataSet.valueFont
                 
-                guard let formatter = dataSet.valueFormatter else { continue }
-                
                 let trans = dataProvider.getTransformer(forAxis: dataSet.axisDependency)
                 let valueToPixelMatrix = trans.valueToPixelMatrix
                 
@@ -143,7 +143,7 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
                 
                 _xBounds.set(chart: dataProvider, dataSet: dataSet, animator: animator)
                 
-                for j in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1)
+                for j in _xBounds
                 {
                     guard let e = dataSet.entryForIndex(j) else { break }
                     
@@ -178,7 +178,7 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
                                 x: pt.x,
                                 y: pt.y - shapeSize - lineHeight),
                             align: .center,
-                            attributes: [NSFontAttributeName: valueFont, NSForegroundColorAttributeName: dataSet.valueTextColorAt(j)]
+                            attributes: [NSAttributedString.Key.font: valueFont, NSAttributedString.Key.foregroundColor: dataSet.valueTextColorAt(j)]
                         )
                     }
                     
@@ -204,8 +204,7 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
     {
         guard
             let dataProvider = dataProvider,
-            let scatterData = dataProvider.scatterData,
-            let animator = animator
+            let scatterData = dataProvider.scatterData
             else { return }
         
         context.saveGState()
diff --git a/Source/Charts/Renderers/XAxisRenderer.swift b/Source/Charts/Renderers/XAxisRenderer.swift
index aaba512938..8f097e8f1e 100755
--- a/Source/Charts/Renderers/XAxisRenderer.swift
+++ b/Source/Charts/Renderers/XAxisRenderer.swift
@@ -12,24 +12,24 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 @objc(ChartXAxisRenderer)
 open class XAxisRenderer: AxisRendererBase
 {
-    public init(viewPortHandler: ViewPortHandler?, xAxis: XAxis?, transformer: Transformer?)
+    @objc public init(viewPortHandler: ViewPortHandler, xAxis: XAxis?, transformer: Transformer?)
     {
         super.init(viewPortHandler: viewPortHandler, transformer: transformer, axis: xAxis)
     }
     
     open override func computeAxis(min: Double, max: Double, inverted: Bool)
     {
-        guard let
-            viewPortHandler = self.viewPortHandler
-            else { return }
-        
         var min = min, max = max
         
         if let transformer = self.transformer
@@ -64,7 +64,7 @@ open class XAxisRenderer: AxisRendererBase
         computeSize()
     }
     
-    open func computeSize()
+    @objc open func computeSize()
     {
         guard let
             xAxis = self.axis as? XAxis
@@ -72,12 +72,12 @@ open class XAxisRenderer: AxisRendererBase
         
         let longest = xAxis.getLongestLabel()
         
-        let labelSize = longest.size(attributes: [NSFontAttributeName: xAxis.labelFont])
+        let labelSize = longest.size(withAttributes: [NSAttributedString.Key.font: xAxis.labelFont])
         
         let labelWidth = labelSize.width
         let labelHeight = labelSize.height
         
-        let labelRotatedSize = ChartUtils.sizeOfRotatedRectangle(labelSize, degrees: xAxis.labelRotationAngle)
+        let labelRotatedSize = labelSize.rotatedBy(degrees: xAxis.labelRotationAngle)
         
         xAxis.labelWidth = labelWidth
         xAxis.labelHeight = labelHeight
@@ -87,10 +87,7 @@ open class XAxisRenderer: AxisRendererBase
     
     open override func renderAxisLabels(context: CGContext)
     {
-        guard let
-            xAxis = self.axis as? XAxis,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let xAxis = self.axis as? XAxis else { return }
         
         if !xAxis.isEnabled || !xAxis.isDrawLabelsEnabled
         {
@@ -122,14 +119,11 @@ open class XAxisRenderer: AxisRendererBase
         }
     }
     
-    fileprivate var _axisLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _axisLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
     
     open override func renderAxisLine(context: CGContext)
     {
-        guard
-            let xAxis = self.axis as? XAxis,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let xAxis = self.axis as? XAxis else { return }
         
         if !xAxis.isEnabled || !xAxis.isDrawAxisLineEnabled
         {
@@ -175,25 +169,22 @@ open class XAxisRenderer: AxisRendererBase
     }
     
     /// draws the x-labels on the specified y-position
-    open func drawLabels(context: CGContext, pos: CGFloat, anchor: CGPoint)
+    @objc open func drawLabels(context: CGContext, pos: CGFloat, anchor: CGPoint)
     {
         guard
             let xAxis = self.axis as? XAxis,
-            let viewPortHandler = self.viewPortHandler,
             let transformer = self.transformer
             else { return }
         
-        #if os(OSX)
-            let paraStyle = NSParagraphStyle.default().mutableCopy() as! NSMutableParagraphStyle
-        #else
-            let paraStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
-        #endif
+        let paraStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         paraStyle.alignment = .center
         
-        let labelAttrs = [NSFontAttributeName: xAxis.labelFont,
-            NSForegroundColorAttributeName: xAxis.labelTextColor,
-            NSParagraphStyleAttributeName: paraStyle] as [String : NSObject]
-        let labelRotationAngleRadians = xAxis.labelRotationAngle * ChartUtils.Math.FDEG2RAD
+        let labelAttrs: [NSAttributedString.Key : Any] = [
+            .font: xAxis.labelFont,
+            .foregroundColor: xAxis.labelTextColor,
+            .paragraphStyle: paraStyle
+        ]
+        let labelRotationAngleRadians = xAxis.labelRotationAngle.DEG2RAD
         
         let centeringEnabled = xAxis.isCenterAxisLabelsEnabled
 
@@ -272,12 +263,12 @@ open class XAxisRenderer: AxisRendererBase
         }
     }
     
-    open func drawLabel(
+    @objc open func drawLabel(
         context: CGContext,
         formattedLabel: String,
         x: CGFloat,
         y: CGFloat,
-        attributes: [String: NSObject],
+        attributes: [NSAttributedString.Key : Any],
         constrainedToSize: CGSize,
         anchor: CGPoint,
         angleRadians: CGFloat)
@@ -338,21 +329,17 @@ open class XAxisRenderer: AxisRendererBase
         }
     }
     
-    open var gridClippingRect: CGRect
+    @objc open var gridClippingRect: CGRect
     {
-        var contentRect = viewPortHandler?.contentRect ?? CGRect.zero
+        var contentRect = viewPortHandler.contentRect
         let dx = self.axis?.gridLineWidth ?? 0.0
         contentRect.origin.x -= dx / 2.0
         contentRect.size.width += dx
         return contentRect
     }
     
-    open func drawGridLine(context: CGContext, x: CGFloat, y: CGFloat)
+    @objc open func drawGridLine(context: CGContext, x: CGFloat, y: CGFloat)
     {
-        guard
-            let viewPortHandler = self.viewPortHandler
-            else { return }
-        
         if x >= viewPortHandler.offsetLeft
             && x <= viewPortHandler.chartWidth
         {
@@ -367,30 +354,16 @@ open class XAxisRenderer: AxisRendererBase
     {
         guard
             let xAxis = self.axis as? XAxis,
-            let viewPortHandler = self.viewPortHandler,
-            let transformer = self.transformer
+            let transformer = self.transformer,
+            !xAxis.limitLines.isEmpty
             else { return }
         
-        var limitLines = xAxis.limitLines
-        
-        if limitLines.count == 0
-        {
-            return
-        }
-        
         let trans = transformer.valueToPixelMatrix
         
         var position = CGPoint(x: 0.0, y: 0.0)
         
-        for i in 0 ..< limitLines.count
+        for l in xAxis.limitLines where l.isEnabled
         {
-            let l = limitLines[i]
-            
-            if !l.isEnabled
-            {
-                continue
-            }
-            
             context.saveGState()
             defer { context.restoreGState() }
             
@@ -408,11 +381,8 @@ open class XAxisRenderer: AxisRendererBase
         }
     }
     
-    open func renderLimitLineLine(context: CGContext, limitLine: ChartLimitLine, position: CGPoint)
+    @objc open func renderLimitLineLine(context: CGContext, limitLine: ChartLimitLine, position: CGPoint)
     {
-        guard
-            let viewPortHandler = self.viewPortHandler
-            else { return }
         
         context.beginPath()
         context.move(to: CGPoint(x: position.x, y: viewPortHandler.contentTop))
@@ -432,62 +402,57 @@ open class XAxisRenderer: AxisRendererBase
         context.strokePath()
     }
     
-    open func renderLimitLineLabel(context: CGContext, limitLine: ChartLimitLine, position: CGPoint, yOffset: CGFloat)
+    @objc open func renderLimitLineLabel(context: CGContext, limitLine: ChartLimitLine, position: CGPoint, yOffset: CGFloat)
     {
-        guard
-            let viewPortHandler = self.viewPortHandler
-            else { return }
         
         let label = limitLine.label
-        
-        // if drawing the limit-value label is enabled
-        if limitLine.drawLabelEnabled && label.characters.count > 0
-        {
-            let labelLineHeight = limitLine.valueFont.lineHeight
-            
-            let xOffset: CGFloat = limitLine.lineWidth + limitLine.xOffset
-            
-            if limitLine.labelPosition == .rightTop
-            {
-                ChartUtils.drawText(context: context,
-                    text: label,
-                    point: CGPoint(
-                        x: position.x + xOffset,
-                        y: viewPortHandler.contentTop + yOffset),
-                    align: .left,
-                    attributes: [NSFontAttributeName: limitLine.valueFont, NSForegroundColorAttributeName: limitLine.valueTextColor])
-            }
-            else if limitLine.labelPosition == .rightBottom
-            {
-                ChartUtils.drawText(context: context,
-                    text: label,
-                    point: CGPoint(
-                        x: position.x + xOffset,
-                        y: viewPortHandler.contentBottom - labelLineHeight - yOffset),
-                    align: .left,
-                    attributes: [NSFontAttributeName: limitLine.valueFont, NSForegroundColorAttributeName: limitLine.valueTextColor])
-            }
-            else if limitLine.labelPosition == .leftTop
-            {
-                ChartUtils.drawText(context: context,
-                    text: label,
-                    point: CGPoint(
-                        x: position.x - xOffset,
-                        y: viewPortHandler.contentTop + yOffset),
-                    align: .right,
-                    attributes: [NSFontAttributeName: limitLine.valueFont, NSForegroundColorAttributeName: limitLine.valueTextColor])
-            }
-            else
-            {
-                ChartUtils.drawText(context: context,
-                    text: label,
-                    point: CGPoint(
-                        x: position.x - xOffset,
-                        y: viewPortHandler.contentBottom - labelLineHeight - yOffset),
-                    align: .right,
-                    attributes: [NSFontAttributeName: limitLine.valueFont, NSForegroundColorAttributeName: limitLine.valueTextColor])
-            }
+        guard limitLine.drawLabelEnabled, !label.isEmpty else { return }
+
+        let labelLineHeight = limitLine.valueFont.lineHeight
+
+        let xOffset: CGFloat = limitLine.lineWidth + limitLine.xOffset
+        let attributes: [NSAttributedString.Key : Any] = [
+            .font : limitLine.valueFont,
+            .foregroundColor : limitLine.valueTextColor
+        ]
+
+        let (point, align): (CGPoint, NSTextAlignment)
+        switch limitLine.labelPosition {
+        case .topRight:
+            point = CGPoint(
+                x: position.x + xOffset,
+                y: viewPortHandler.contentTop + yOffset
+            )
+            align = .left
+
+        case .bottomRight:
+            point = CGPoint(
+                x: position.x + xOffset,
+                y: viewPortHandler.contentBottom - labelLineHeight - yOffset
+            )
+            align = .left
+
+        case .topLeft:
+            point = CGPoint(
+                x: position.x - xOffset,
+                y: viewPortHandler.contentTop + yOffset
+            )
+            align = .right
+
+        case .bottomLeft:
+            point = CGPoint(
+                x: position.x - xOffset,
+                y: viewPortHandler.contentBottom - labelLineHeight - yOffset
+            )
+            align = .right
         }
-    }
 
+        ChartUtils.drawText(
+            context: context,
+            text: label,
+            point: point,
+            align: align,
+            attributes: attributes
+        )
+    }
 }
diff --git a/Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift b/Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift
index 200fd2d9ce..ce777746a0 100644
--- a/Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift
+++ b/Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift
@@ -12,15 +12,11 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 open class XAxisRendererHorizontalBarChart: XAxisRenderer
 {
-    internal var chart: BarChartView?
+    internal weak var chart: BarChartView?
     
-    public init(viewPortHandler: ViewPortHandler?, xAxis: XAxis?, transformer: Transformer?, chart: BarChartView?)
+    @objc public init(viewPortHandler: ViewPortHandler, xAxis: XAxis?, transformer: Transformer?, chart: BarChartView)
     {
         super.init(viewPortHandler: viewPortHandler, xAxis: xAxis, transformer: transformer)
         
@@ -29,17 +25,13 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
     
     open override func computeAxis(min: Double, max: Double, inverted: Bool)
     {
-        guard let
-            viewPortHandler = self.viewPortHandler
-            else { return }
-        
         var min = min, max = max
         
         if let transformer = self.transformer
         {
             // calculate the starting and entry point of the y-labels (depending on
             // zoom / contentrect bounds)
-            if viewPortHandler.contentWidth > 10 && !viewPortHandler.isFullyZoomedOutX
+            if viewPortHandler.contentWidth > 10 && !viewPortHandler.isFullyZoomedOutY
             {
                 let p1 = transformer.valueForTouchPoint(CGPoint(x: viewPortHandler.contentLeft, y: viewPortHandler.contentBottom))
                 let p2 = transformer.valueForTouchPoint(CGPoint(x: viewPortHandler.contentLeft, y: viewPortHandler.contentTop))
@@ -68,13 +60,12 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
        
         let longest = xAxis.getLongestLabel() as NSString
         
-        let labelSize = longest.size(attributes: [NSFontAttributeName: xAxis.labelFont])
+        let labelSize = longest.size(withAttributes: [NSAttributedString.Key.font: xAxis.labelFont])
         
         let labelWidth = floor(labelSize.width + xAxis.xOffset * 3.5)
         let labelHeight = labelSize.height
-        
-        let labelRotatedSize = ChartUtils.sizeOfRotatedRectangle(rectangleWidth: labelSize.width, rectangleHeight:  labelHeight, degrees: xAxis.labelRotationAngle)
-        
+        let labelRotatedSize = CGSize(width: labelSize.width, height: labelHeight).rotatedBy(degrees: xAxis.labelRotationAngle)
+
         xAxis.labelWidth = labelWidth
         xAxis.labelHeight = labelHeight
         xAxis.labelRotatedWidth = round(labelRotatedSize.width + xAxis.xOffset * 3.5)
@@ -84,8 +75,7 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
     open override func renderAxisLabels(context: CGContext)
     {
         guard
-            let xAxis = self.axis as? XAxis,
-            let viewPortHandler = self.viewPortHandler
+            let xAxis = self.axis as? XAxis
             else { return }
         
         if !xAxis.isEnabled || !xAxis.isDrawLabelsEnabled || chart?.data === nil
@@ -123,13 +113,12 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
     {
         guard
             let xAxis = self.axis as? XAxis,
-            let transformer = self.transformer,
-            let viewPortHandler = self.viewPortHandler
+            let transformer = self.transformer
             else { return }
         
         let labelFont = xAxis.labelFont
         let labelTextColor = xAxis.labelTextColor
-        let labelRotationAngleRadians = xAxis.labelRotationAngle * ChartUtils.Math.FDEG2RAD
+        let labelRotationAngleRadians = xAxis.labelRotationAngle.DEG2RAD
         
         let centeringEnabled = xAxis.isCenterAxisLabelsEnabled
         
@@ -162,7 +151,7 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
                         formattedLabel: label,
                         x: pos,
                         y: position.y,
-                        attributes: [NSFontAttributeName: labelFont, NSForegroundColorAttributeName: labelTextColor],
+                        attributes: [NSAttributedString.Key.font: labelFont, NSAttributedString.Key.foregroundColor: labelTextColor],
                         anchor: anchor,
                         angleRadians: labelRotationAngleRadians)
                 }
@@ -170,12 +159,12 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
         }
     }
     
-    open func drawLabel(
+    @objc open func drawLabel(
         context: CGContext,
         formattedLabel: String,
         x: CGFloat,
         y: CGFloat,
-        attributes: [String: NSObject],
+        attributes: [NSAttributedString.Key : Any],
         anchor: CGPoint,
         angleRadians: CGFloat)
     {
@@ -190,21 +179,17 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
     
     open override var gridClippingRect: CGRect
     {
-        var contentRect = viewPortHandler?.contentRect ?? CGRect.zero
+        var contentRect = viewPortHandler.contentRect
         let dy = self.axis?.gridLineWidth ?? 0.0
         contentRect.origin.y -= dy / 2.0
         contentRect.size.height += dy
         return contentRect
     }
     
-    fileprivate var _gridLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _gridLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
     
     open override func drawGridLine(context: CGContext, x: CGFloat, y: CGFloat)
     {
-        guard
-            let viewPortHandler = self.viewPortHandler
-            else { return }
-        
         if viewPortHandler.isInBoundsY(y)
         {
             context.beginPath()
@@ -216,10 +201,7 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
     
     open override func renderAxisLine(context: CGContext)
     {
-        guard
-            let xAxis = self.axis as? XAxis,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let xAxis = self.axis as? XAxis else { return }
         
         if !xAxis.isEnabled || !xAxis.isDrawAxisLineEnabled
         {
@@ -266,7 +248,6 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
     {
         guard
             let xAxis = self.axis as? XAxis,
-            let viewPortHandler = self.viewPortHandler,
             let transformer = self.transformer
             else { return }
         
@@ -322,14 +303,14 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
             let label = l.label
             
             // if drawing the limit-value label is enabled
-            if l.drawLabelEnabled && label.characters.count > 0
+            if l.drawLabelEnabled && label.count > 0
             {
                 let labelLineHeight = l.valueFont.lineHeight
                 
                 let xOffset: CGFloat = 4.0 + l.xOffset
                 let yOffset: CGFloat = l.lineWidth + labelLineHeight + l.yOffset
                 
-                if l.labelPosition == .rightTop
+                if l.labelPosition == .topRight
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -337,9 +318,9 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
                             x: viewPortHandler.contentRight - xOffset,
                             y: position.y - yOffset),
                         align: .right,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
-                else if l.labelPosition == .rightBottom
+                else if l.labelPosition == .bottomRight
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -347,9 +328,9 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
                             x: viewPortHandler.contentRight - xOffset,
                             y: position.y + yOffset - labelLineHeight),
                         align: .right,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
-                else if l.labelPosition == .leftTop
+                else if l.labelPosition == .topLeft
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -357,7 +338,7 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
                             x: viewPortHandler.contentLeft + xOffset,
                             y: position.y - yOffset),
                         align: .left,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
                 else
                 {
@@ -367,7 +348,7 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
                             x: viewPortHandler.contentLeft + xOffset,
                             y: position.y + yOffset - labelLineHeight),
                         align: .left,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
             }
         }
diff --git a/Source/Charts/Renderers/XAxisRendererRadarChart.swift b/Source/Charts/Renderers/XAxisRendererRadarChart.swift
index 66b3006c87..c5fcedf54c 100644
--- a/Source/Charts/Renderers/XAxisRendererRadarChart.swift
+++ b/Source/Charts/Renderers/XAxisRendererRadarChart.swift
@@ -12,15 +12,11 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 open class XAxisRendererRadarChart: XAxisRenderer
 {
-    open weak var chart: RadarChartView?
+    @objc open weak var chart: RadarChartView?
     
-    public init(viewPortHandler: ViewPortHandler?, xAxis: XAxis?, chart: RadarChartView?)
+    @objc public init(viewPortHandler: ViewPortHandler, xAxis: XAxis?, chart: RadarChartView)
     {
         super.init(viewPortHandler: viewPortHandler, xAxis: xAxis, transformer: nil)
         
@@ -41,7 +37,7 @@ open class XAxisRendererRadarChart: XAxisRenderer
         
         let labelFont = xAxis.labelFont
         let labelTextColor = xAxis.labelTextColor
-        let labelRotationAngleRadians = xAxis.labelRotationAngle * ChartUtils.Math.FDEG2RAD
+        let labelRotationAngleRadians = xAxis.labelRotationAngle.RAD2DEG
         let drawLabelAnchor = CGPoint(x: 0.5, y: 0.25)
         
         let sliceangle = chart.sliceAngle
@@ -58,24 +54,24 @@ open class XAxisRendererRadarChart: XAxisRenderer
             
             let angle = (sliceangle * CGFloat(i) + chart.rotationAngle).truncatingRemainder(dividingBy: 360.0)
             
-            let p = ChartUtils.getPosition(center: center, dist: CGFloat(chart.yRange) * factor + xAxis.labelRotatedWidth / 2.0, angle: angle)
+            let p = center.moving(distance: CGFloat(chart.yRange) * factor + xAxis.labelRotatedWidth / 2.0, atAngle: angle)
             
             drawLabel(context: context,
                       formattedLabel: label,
                       x: p.x,
                       y: p.y - xAxis.labelRotatedHeight / 2.0,
-                      attributes: [NSFontAttributeName: labelFont, NSForegroundColorAttributeName: labelTextColor],
+                      attributes: [NSAttributedString.Key.font: labelFont, NSAttributedString.Key.foregroundColor: labelTextColor],
                       anchor: drawLabelAnchor,
                       angleRadians: labelRotationAngleRadians)
         }
     }
     
-    open func drawLabel(
+    @objc open func drawLabel(
         context: CGContext,
         formattedLabel: String,
         x: CGFloat,
         y: CGFloat,
-        attributes: [String: NSObject],
+        attributes: [NSAttributedString.Key : Any],
         anchor: CGPoint,
         angleRadians: CGFloat)
     {
diff --git a/Source/Charts/Renderers/YAxisRenderer.swift b/Source/Charts/Renderers/YAxisRenderer.swift
index 929dd39434..b1f72cd6c4 100755
--- a/Source/Charts/Renderers/YAxisRenderer.swift
+++ b/Source/Charts/Renderers/YAxisRenderer.swift
@@ -12,14 +12,18 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 @objc(ChartYAxisRenderer)
 open class YAxisRenderer: AxisRendererBase
 {
-    public init(viewPortHandler: ViewPortHandler?, yAxis: YAxis?, transformer: Transformer?)
+    @objc public init(viewPortHandler: ViewPortHandler, yAxis: YAxis?, transformer: Transformer?)
     {
         super.init(viewPortHandler: viewPortHandler, transformer: transformer, axis: yAxis)
     }
@@ -27,10 +31,7 @@ open class YAxisRenderer: AxisRendererBase
     /// draws the y-axis labels to the screen
     open override func renderAxisLabels(context: CGContext)
     {
-        guard
-            let yAxis = self.axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let yAxis = self.axis as? YAxis else { return }
         
         if !yAxis.isEnabled || !yAxis.isDrawLabelsEnabled
         {
@@ -85,10 +86,7 @@ open class YAxisRenderer: AxisRendererBase
     
     open override func renderAxisLine(context: CGContext)
     {
-        guard
-            let yAxis = self.axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let yAxis = self.axis as? YAxis else { return }
         
         if !yAxis.isEnabled || !yAxis.drawAxisLineEnabled
         {
@@ -127,7 +125,7 @@ open class YAxisRenderer: AxisRendererBase
     }
     
     /// draws the y-labels on the specified x-position
-    internal func drawYLabels(
+    open func drawYLabels(
         context: CGContext,
         fixedPosition: CGFloat,
         positions: [CGPoint],
@@ -144,6 +142,8 @@ open class YAxisRenderer: AxisRendererBase
         let from = yAxis.isDrawBottomYLabelEntryEnabled ? 0 : 1
         let to = yAxis.isDrawTopYLabelEntryEnabled ? yAxis.entryCount : (yAxis.entryCount - 1)
         
+        let xOffset = yAxis.labelXOffset
+        
         for i in stride(from: from, to: to, by: 1)
         {
             var text = ""
@@ -158,9 +158,10 @@ open class YAxisRenderer: AxisRendererBase
             ChartUtils.drawText(
                 context: context,
                 text: text,
-                point: CGPoint(x: fixedPosition, y: positions[i].y + offset),
+                point: CGPoint(x: fixedPosition + xOffset, y: positions[i].y + offset),
                 align: textAlign,
-                attributes: [NSFontAttributeName: labelFont, NSForegroundColorAttributeName: labelTextColor])
+                attributes: [.font: labelFont, .foregroundColor: labelTextColor]
+            )
         }
     }
     
@@ -199,10 +200,7 @@ open class YAxisRenderer: AxisRendererBase
             }
             
             // draw the grid
-            for i in 0 ..< positions.count
-            {
-                drawGridLine(context: context, position: positions[i])
-            }
+            positions.forEach { drawGridLine(context: context, position: $0) }
         }
 
         if yAxis.drawZeroLineEnabled
@@ -212,30 +210,26 @@ open class YAxisRenderer: AxisRendererBase
         }
     }
     
-    open var gridClippingRect: CGRect
+    @objc open var gridClippingRect: CGRect
     {
-        var contentRect = viewPortHandler?.contentRect ?? CGRect.zero
+        var contentRect = viewPortHandler.contentRect
         let dy = self.axis?.gridLineWidth ?? 0.0
         contentRect.origin.y -= dy / 2.0
         contentRect.size.height += dy
         return contentRect
     }
     
-    open func drawGridLine(
+    @objc open func drawGridLine(
         context: CGContext,
         position: CGPoint)
     {
-        guard
-            let viewPortHandler = self.viewPortHandler
-            else { return }
-        
         context.beginPath()
         context.move(to: CGPoint(x: viewPortHandler.contentLeft, y: position.y))
         context.addLine(to: CGPoint(x: viewPortHandler.contentRight, y: position.y))
         context.strokePath()
     }
     
-    open func transformedPositions() -> [CGPoint]
+    @objc open func transformedPositions() -> [CGPoint]
     {
         guard
             let yAxis = self.axis as? YAxis,
@@ -258,11 +252,10 @@ open class YAxisRenderer: AxisRendererBase
     }
 
     /// Draws the zero line at the specified position.
-    open func drawZeroLine(context: CGContext)
+    @objc open func drawZeroLine(context: CGContext)
     {
         guard
             let yAxis = self.axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler,
             let transformer = self.transformer,
             let zeroLineColor = yAxis.zeroLineColor
             else { return }
@@ -298,7 +291,6 @@ open class YAxisRenderer: AxisRendererBase
     {
         guard
             let yAxis = self.axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler,
             let transformer = self.transformer
             else { return }
         
@@ -356,14 +348,14 @@ open class YAxisRenderer: AxisRendererBase
             let label = l.label
             
             // if drawing the limit-value label is enabled
-            if l.drawLabelEnabled && label.characters.count > 0
+            if l.drawLabelEnabled && label.count > 0
             {
                 let labelLineHeight = l.valueFont.lineHeight
                 
                 let xOffset: CGFloat = 4.0 + l.xOffset
                 let yOffset: CGFloat = l.lineWidth + labelLineHeight + l.yOffset
                 
-                if l.labelPosition == .rightTop
+                if l.labelPosition == .topRight
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -371,9 +363,9 @@ open class YAxisRenderer: AxisRendererBase
                             x: viewPortHandler.contentRight - xOffset,
                             y: position.y - yOffset),
                         align: .right,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
-                else if l.labelPosition == .rightBottom
+                else if l.labelPosition == .bottomRight
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -381,9 +373,9 @@ open class YAxisRenderer: AxisRendererBase
                             x: viewPortHandler.contentRight - xOffset,
                             y: position.y + yOffset - labelLineHeight),
                         align: .right,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
-                else if l.labelPosition == .leftTop
+                else if l.labelPosition == .topLeft
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -391,7 +383,7 @@ open class YAxisRenderer: AxisRendererBase
                             x: viewPortHandler.contentLeft + xOffset,
                             y: position.y - yOffset),
                         align: .left,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
                 else
                 {
@@ -401,7 +393,7 @@ open class YAxisRenderer: AxisRendererBase
                             x: viewPortHandler.contentLeft + xOffset,
                             y: position.y + yOffset - labelLineHeight),
                         align: .left,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
             }
         }
diff --git a/Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift b/Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift
index 621d6dd6ed..aaf0cd2553 100644
--- a/Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift
+++ b/Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift
@@ -12,13 +12,9 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
 open class YAxisRendererHorizontalBarChart: YAxisRenderer
 {
-    public override init(viewPortHandler: ViewPortHandler?, yAxis: YAxis?, transformer: Transformer?)
+    public override init(viewPortHandler: ViewPortHandler, yAxis: YAxis?, transformer: Transformer?)
     {
         super.init(viewPortHandler: viewPortHandler, yAxis: yAxis, transformer: transformer)
     }
@@ -26,10 +22,7 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
     /// Computes the axis values.
     open override func computeAxis(min: Double, max: Double, inverted: Bool)
     {
-        guard
-            let viewPortHandler = self.viewPortHandler,
-            let transformer = self.transformer
-            else { return }
+        guard let transformer = self.transformer else { return }
         
         var min = min, max = max
         
@@ -57,10 +50,7 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
     /// draws the y-axis labels to the screen
     open override func renderAxisLabels(context: CGContext)
     {
-        guard
-            let yAxis = axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let yAxis = axis as? YAxis else { return }
         
         if !yAxis.isEnabled || !yAxis.isDrawLabelsEnabled
         {
@@ -111,10 +101,7 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
     
     open override func renderAxisLine(context: CGContext)
     {
-        guard
-            let yAxis = axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler
-            else { return }
+        guard let yAxis = axis as? YAxis else { return }
         
         if !yAxis.isEnabled || !yAxis.drawAxisLineEnabled
         {
@@ -152,7 +139,7 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
     }
 
     /// draws the y-labels on the specified x-position
-    open func drawYLabels(
+    @objc open func drawYLabels(
         context: CGContext,
         fixedPosition: CGFloat,
         positions: [CGPoint],
@@ -168,6 +155,8 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
         let from = yAxis.isDrawBottomYLabelEntryEnabled ? 0 : 1
         let to = yAxis.isDrawTopYLabelEntryEnabled ? yAxis.entryCount : (yAxis.entryCount - 1)
         
+        let xOffset = yAxis.labelXOffset
+        
         for i in stride(from: from, to: to, by: 1)
         {
             let text = yAxis.getFormattedLabel(i)
@@ -175,15 +164,18 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
             ChartUtils.drawText(
                 context: context,
                 text: text,
-                point: CGPoint(x: positions[i].x, y: fixedPosition - offset),
+                point: CGPoint(
+                    x: positions[i].x, y:
+                    fixedPosition - offset + xOffset
+                ),
                 align: .center,
-                attributes: [NSFontAttributeName: labelFont, NSForegroundColorAttributeName: labelTextColor])
+                attributes: [NSAttributedString.Key.font: labelFont, NSAttributedString.Key.foregroundColor: labelTextColor])
         }
     }
     
     open override var gridClippingRect: CGRect
     {
-        var contentRect = viewPortHandler?.contentRect ?? CGRect.zero
+        var contentRect = viewPortHandler.contentRect
         let dx = self.axis?.gridLineWidth ?? 0.0
         contentRect.origin.x -= dx / 2.0
         contentRect.size.width += dx
@@ -194,10 +186,6 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
         context: CGContext,
         position: CGPoint)
     {
-        guard
-            let viewPortHandler = self.viewPortHandler
-            else { return }
-        
         context.beginPath()
         context.move(to: CGPoint(x: position.x, y: viewPortHandler.contentTop))
         context.addLine(to: CGPoint(x: position.x, y: viewPortHandler.contentBottom))
@@ -231,7 +219,6 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
     {
         guard
             let yAxis = self.axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler,
             let transformer = self.transformer,
             let zeroLineColor = yAxis.zeroLineColor
             else { return }
@@ -263,13 +250,12 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
         context.drawPath(using: CGPathDrawingMode.stroke)
     }
     
-    fileprivate var _limitLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
+    private var _limitLineSegmentsBuffer = [CGPoint](repeating: CGPoint(), count: 2)
     
     open override func renderLimitLines(context: CGContext)
     {
         guard
             let yAxis = axis as? YAxis,
-            let viewPortHandler = self.viewPortHandler,
             let transformer = self.transformer
             else { return }
         
@@ -327,14 +313,14 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
             let label = l.label
 
             // if drawing the limit-value label is enabled
-            if l.drawLabelEnabled && label.characters.count > 0
+            if l.drawLabelEnabled && label.count > 0
             {
                 let labelLineHeight = l.valueFont.lineHeight
                 
                 let xOffset: CGFloat = l.lineWidth + l.xOffset
                 let yOffset: CGFloat = 2.0 + l.yOffset
 
-                if l.labelPosition == .rightTop
+                if l.labelPosition == .topRight
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -342,9 +328,9 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
                             x: position.x + xOffset,
                             y: viewPortHandler.contentTop + yOffset),
                         align: .left,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
-                else if l.labelPosition == .rightBottom
+                else if l.labelPosition == .bottomRight
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -352,9 +338,9 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
                             x: position.x + xOffset,
                             y: viewPortHandler.contentBottom - labelLineHeight - yOffset),
                         align: .left,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
-                else if l.labelPosition == .leftTop
+                else if l.labelPosition == .topLeft
                 {
                     ChartUtils.drawText(context: context,
                         text: label,
@@ -362,7 +348,7 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
                             x: position.x - xOffset,
                             y: viewPortHandler.contentTop + yOffset),
                         align: .right,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
                 else
                 {
@@ -372,7 +358,7 @@ open class YAxisRendererHorizontalBarChart: YAxisRenderer
                             x: position.x - xOffset,
                             y: viewPortHandler.contentBottom - labelLineHeight - yOffset),
                         align: .right,
-                        attributes: [NSFontAttributeName: l.valueFont, NSForegroundColorAttributeName: l.valueTextColor])
+                        attributes: [NSAttributedString.Key.font: l.valueFont, NSAttributedString.Key.foregroundColor: l.valueTextColor])
                 }
             }
         }
diff --git a/Source/Charts/Renderers/YAxisRendererRadarChart.swift b/Source/Charts/Renderers/YAxisRendererRadarChart.swift
index bd04c08470..a5e44daa63 100644
--- a/Source/Charts/Renderers/YAxisRendererRadarChart.swift
+++ b/Source/Charts/Renderers/YAxisRendererRadarChart.swift
@@ -12,15 +12,19 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
 open class YAxisRendererRadarChart: YAxisRenderer
 {
-    fileprivate weak var chart: RadarChartView?
+    private weak var chart: RadarChartView?
     
-    public init(viewPortHandler: ViewPortHandler?, yAxis: YAxis?, chart: RadarChartView?)
+    @objc public init(viewPortHandler: ViewPortHandler, yAxis: YAxis?, chart: RadarChartView)
     {
         super.init(viewPortHandler: viewPortHandler, yAxis: yAxis, transformer: nil)
         
@@ -45,7 +49,7 @@ open class YAxisRendererRadarChart: YAxisRenderer
         
         // Find out how much spacing (in yValue space) between axis values
         let rawInterval = range / Double(labelCount)
-        var interval = ChartUtils.roundToNextSignificant(number: Double(rawInterval))
+        var interval = rawInterval.roundedToNextSignficant()
         
         // If granularity is enabled, then do not allow the interval to go below specified granularity.
         // This is used to avoid repeated values when rounding values for display.
@@ -55,14 +59,14 @@ open class YAxisRendererRadarChart: YAxisRenderer
         }
         
         // Normalize interval
-        let intervalMagnitude = ChartUtils.roundToNextSignificant(number: pow(10.0, floor(log10(interval))))
+        let intervalMagnitude = pow(10.0, floor(log10(interval))).roundedToNextSignficant()
         let intervalSigDigit = Int(interval / intervalMagnitude)
         
         if intervalSigDigit > 5
         {
-            // Use one order of magnitude higher, to avoid intervals like 0.9 or
-            // 90
-            interval = floor(10 * intervalMagnitude)
+            // Use one order of magnitude higher, to avoid intervals like 0.9 or 90
+            // if it's 0.0 after floor(), we use the old value
+            interval = floor(10.0 * intervalMagnitude) == 0.0 ? interval : floor(10.0 * intervalMagnitude)
         }
         
         let centeringEnabled = axis.isCenterAxisLabelsEnabled
@@ -98,7 +102,7 @@ open class YAxisRendererRadarChart: YAxisRenderer
                 first -= interval
             }
 
-            let last = interval == 0.0 ? 0.0 : ChartUtils.nextUp(floor(yMax / interval) * interval)
+            let last = interval == 0.0 ? 0.0 : (floor(yMax / interval) * interval).nextUp
             
             if interval != 0.0
             {
@@ -181,23 +185,26 @@ open class YAxisRendererRadarChart: YAxisRenderer
         
         let from = yAxis.isDrawBottomYLabelEntryEnabled ? 0 : 1
         let to = yAxis.isDrawTopYLabelEntryEnabled ? yAxis.entryCount : (yAxis.entryCount - 1)
+
+        let alignment: NSTextAlignment = yAxis.labelAlignment
+        let xOffset = yAxis.labelXOffset
         
         for j in stride(from: from, to: to, by: 1)
         {
             let r = CGFloat(yAxis.entries[j] - yAxis._axisMinimum) * factor
             
-            let p = ChartUtils.getPosition(center: center, dist: r, angle: chart.rotationAngle)
+            let p = center.moving(distance: r, atAngle: chart.rotationAngle)
             
             let label = yAxis.getFormattedLabel(j)
             
             ChartUtils.drawText(
                 context: context,
                 text: label,
-                point: CGPoint(x: p.x + 10.0, y: p.y - labelLineHeight),
-                align: .left,
+                point: CGPoint(x: p.x + xOffset, y: p.y - labelLineHeight),
+                align: alignment,
                 attributes: [
-                    NSFontAttributeName: labelFont,
-                    NSForegroundColorAttributeName: labelTextColor
+                    NSAttributedString.Key.font: labelFont,
+                    NSAttributedString.Key.foregroundColor: labelTextColor
                 ])
         }
     }
@@ -210,7 +217,7 @@ open class YAxisRendererRadarChart: YAxisRenderer
             let data = chart.data
             else { return }
         
-        var limitLines = yAxis.limitLines
+        let limitLines = yAxis.limitLines
         
         if limitLines.count == 0
         {
@@ -252,7 +259,7 @@ open class YAxisRendererRadarChart: YAxisRenderer
             
             for j in 0 ..< (data.maxEntryCountSet?.entryCount ?? 0)
             {
-                let p = ChartUtils.getPosition(center: center, dist: r, angle: sliceangle * CGFloat(j) + chart.rotationAngle)
+                let p = center.moving(distance: r, atAngle: sliceangle * CGFloat(j) + chart.rotationAngle)
                 
                 if j == 0
                 {
diff --git a/Source/Charts/Utils/ChartColorTemplates.swift b/Source/Charts/Utils/ChartColorTemplates.swift
index 8ce7b49acc..534f9cb880 100644
--- a/Source/Charts/Utils/ChartColorTemplates.swift
+++ b/Source/Charts/Utils/ChartColorTemplates.swift
@@ -12,14 +12,9 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
-    import UIKit
-#endif
-
-
 open class ChartColorTemplates: NSObject
 {
-    open class func liberty () -> [NSUIColor]
+    @objc open class func liberty () -> [NSUIColor]
     {
         return [
             NSUIColor(red: 207/255.0, green: 248/255.0, blue: 246/255.0, alpha: 1.0),
@@ -30,7 +25,7 @@ open class ChartColorTemplates: NSObject
         ]
     }
     
-    open class func joyful () -> [NSUIColor]
+    @objc open class func joyful () -> [NSUIColor]
     {
         return [
             NSUIColor(red: 217/255.0, green: 80/255.0, blue: 138/255.0, alpha: 1.0),
@@ -41,7 +36,7 @@ open class ChartColorTemplates: NSObject
         ]
     }
     
-    open class func pastel () -> [NSUIColor]
+    @objc open class func pastel () -> [NSUIColor]
     {
         return [
             NSUIColor(red: 64/255.0, green: 89/255.0, blue: 128/255.0, alpha: 1.0),
@@ -52,7 +47,7 @@ open class ChartColorTemplates: NSObject
         ]
     }
     
-    open class func colorful () -> [NSUIColor]
+    @objc open class func colorful () -> [NSUIColor]
     {
         return [
             NSUIColor(red: 193/255.0, green: 37/255.0, blue: 82/255.0, alpha: 1.0),
@@ -63,7 +58,7 @@ open class ChartColorTemplates: NSObject
         ]
     }
     
-    open class func vordiplom () -> [NSUIColor]
+    @objc open class func vordiplom () -> [NSUIColor]
     {
         return [
             NSUIColor(red: 192/255.0, green: 255/255.0, blue: 140/255.0, alpha: 1.0),
@@ -74,7 +69,7 @@ open class ChartColorTemplates: NSObject
         ]
     }
     
-    open class func material () -> [NSUIColor]
+    @objc open class func material () -> [NSUIColor]
     {
         return [
             NSUIColor(red: 46/255.0, green: 204/255.0, blue: 113/255.0, alpha: 1.0),
@@ -84,7 +79,7 @@ open class ChartColorTemplates: NSObject
         ]
     }
     
-    open class func colorFromString(_ colorString: String) -> NSUIColor
+    @objc open class func colorFromString(_ colorString: String) -> NSUIColor
     {
         let leftParenCharset: CharacterSet = CharacterSet(charactersIn: "( ")
         let commaCharset: CharacterSet = CharacterSet(charactersIn: ", ")
diff --git a/Source/Charts/Utils/ChartUtils.swift b/Source/Charts/Utils/ChartUtils.swift
old mode 100755
new mode 100644
index 2228065f2c..5e90873b51
--- a/Source/Charts/Utils/ChartUtils.swift
+++ b/Source/Charts/Utils/ChartUtils.swift
@@ -12,73 +12,121 @@
 import Foundation
 import CoreGraphics
 
-#if !os(OSX)
+#if canImport(UIKit)
     import UIKit
 #endif
 
-open class ChartUtils
+#if canImport(Cocoa)
+import Cocoa
+#endif
+
+extension Comparable
 {
-    fileprivate static var _defaultValueFormatter: IValueFormatter = ChartUtils.generateDefaultValueFormatter()
-    
-    internal struct Math
+    func clamped(to range: ClosedRange<Self>) -> Self
     {
-        internal static let FDEG2RAD = CGFloat(Double.pi / 180.0)
-        internal static let FRAD2DEG = CGFloat(180.0 / Double.pi)
-        internal static let DEG2RAD = Double.pi / 180.0
-        internal static let RAD2DEG = 180.0 / Double.pi
-    }
-    
-    internal class func roundToNextSignificant(number: Double) -> Double
-    {
-        if number.isInfinite || number.isNaN || number == 0
+        if self > range.upperBound
         {
-            return number
+            return range.upperBound
         }
-        
-        let d = ceil(log10(number < 0.0 ? -number : number))
-        let pw = 1 - Int(d)
-        let magnitude = pow(Double(10.0), Double(pw))
-        let shifted = round(number * magnitude)
-        return shifted / magnitude
-    }
-    
-    internal class func decimals(_ number: Double) -> Int
-    {
-        if number.isNaN || number.isInfinite || number == 0.0
+        else if self < range.lowerBound
         {
-            return 0
+            return range.lowerBound
         }
-        
-        let i = roundToNextSignificant(number: Double(number))
-        
-        if i.isInfinite || i.isNaN
+        else
         {
-            return 0
+            return self
         }
-        
-        return Int(ceil(-log10(i))) + 2
     }
-    
-    internal class func nextUp(_ number: Double) -> Double
+}
+
+extension FloatingPoint
+{
+    var DEG2RAD: Self
     {
-        if number.isInfinite || number.isNaN
-        {
-            return number
-        }
-        else
-        {
-            return number + Double.ulpOfOne
-        }
+        return self * .pi / 180
     }
-    
-    /// Calculates the position around a center point, depending on the distance from the center, and the angle of the position around the center.
-    internal class func getPosition(center: CGPoint, dist: CGFloat, angle: CGFloat) -> CGPoint
+
+    var RAD2DEG: Self
     {
-        return CGPoint(
-            x: center.x + dist * cos(angle * Math.FDEG2RAD),
-            y: center.y + dist * sin(angle * Math.FDEG2RAD)
+        return self * 180 / .pi
+    }
+
+    /// - Note: Value must be in degrees
+    /// - Returns: An angle between 0.0 < 360.0 (not less than zero, less than 360)
+    var normalizedAngle: Self
+    {
+        let angle = truncatingRemainder(dividingBy: 360)
+        return (sign == .minus) ? angle + 360 : angle
+    }
+}
+
+extension CGSize
+{
+    func rotatedBy(degrees: CGFloat) -> CGSize
+    {
+        let radians = degrees.DEG2RAD
+        return rotatedBy(radians: radians)
+    }
+
+    func rotatedBy(radians: CGFloat) -> CGSize
+    {
+        return CGSize(
+            width: abs(width * cos(radians)) + abs(height * sin(radians)),
+            height: abs(width * sin(radians)) + abs(height * cos(radians))
         )
     }
+}
+
+extension Double
+{
+    /// Rounds the number to the nearest multiple of it's order of magnitude, rounding away from zero if halfway.
+    func roundedToNextSignficant() -> Double
+    {
+        guard
+            !isInfinite,
+            !isNaN,
+            self != 0
+            else { return self }
+
+        let d = ceil(log10(self < 0 ? -self : self))
+        let pw = 1 - Int(d)
+        let magnitude = pow(10.0, Double(pw))
+        let shifted = (self * magnitude).rounded()
+        return shifted / magnitude
+    }
+
+    var decimalPlaces: Int
+    {
+        guard
+            !isNaN,
+            !isInfinite,
+            self != 0.0
+            else { return 0 }
+
+        let i = self.roundedToNextSignficant()
+
+        guard
+            !i.isInfinite,
+            !i.isNaN
+            else { return 0 }
+
+        return Int(ceil(-log10(i))) + 2
+    }
+}
+
+extension CGPoint
+{
+    /// Calculates the position around a center point, depending on the distance from the center, and the angle of the position around the center.
+    func moving(distance: CGFloat, atAngle angle: CGFloat) -> CGPoint
+    {
+        return CGPoint(x: x + distance * cos(angle.DEG2RAD),
+                       y: y + distance * sin(angle.DEG2RAD))
+    }
+}
+
+open class ChartUtils
+{
+    private static var _defaultValueFormatter: IValueFormatter = ChartUtils.generateDefaultValueFormatter()
     
     open class func drawImage(
         context: CGContext,
@@ -123,17 +171,17 @@ open class ChartUtils
         NSUIGraphicsPopContext()
     }
     
-    open class func drawText(context: CGContext, text: String, point: CGPoint, align: NSTextAlignment, attributes: [String : AnyObject]?)
+    open class func drawText(context: CGContext, text: String, point: CGPoint, align: NSTextAlignment, attributes: [NSAttributedString.Key : Any]?)
     {
         var point = point
         
         if align == .center
         {
-            point.x -= text.size(attributes: attributes).width / 2.0
+            point.x -= text.size(withAttributes: attributes).width / 2.0
         }
         else if align == .right
         {
-            point.x -= text.size(attributes: attributes).width
+            point.x -= text.size(withAttributes: attributes).width
         }
         
         NSUIGraphicsPushContext(context)
@@ -143,7 +191,7 @@ open class ChartUtils
         NSUIGraphicsPopContext()
     }
     
-    open class func drawText(context: CGContext, text: String, point: CGPoint, attributes: [String : AnyObject]?, anchor: CGPoint, angleRadians: CGFloat)
+    open class func drawText(context: CGContext, text: String, point: CGPoint, attributes: [NSAttributedString.Key : Any]?, anchor: CGPoint, angleRadians: CGFloat)
     {
         var drawOffset = CGPoint()
         
@@ -151,7 +199,7 @@ open class ChartUtils
         
         if angleRadians != 0.0
         {
-            let size = text.size(attributes: attributes)
+            let size = text.size(withAttributes: attributes)
             
             // Move the text drawing rect in a way that it always rotates around its center
             drawOffset.x = -size.width * 0.5
@@ -162,7 +210,7 @@ open class ChartUtils
             // Move the "outer" rect relative to the anchor, assuming its centered
             if anchor.x != 0.5 || anchor.y != 0.5
             {
-                let rotatedSize = sizeOfRotatedRectangle(size, radians: angleRadians)
+                let rotatedSize = size.rotatedBy(radians: angleRadians)
                 
                 translate.x -= rotatedSize.width * (anchor.x - 0.5)
                 translate.y -= rotatedSize.height * (anchor.y - 0.5)
@@ -180,7 +228,7 @@ open class ChartUtils
         {
             if anchor.x != 0.0 || anchor.y != 0.0
             {
-                let size = text.size(attributes: attributes)
+                let size = text.size(withAttributes: attributes)
                 
                 drawOffset.x = -size.width * anchor.x
                 drawOffset.y = -size.height * anchor.y
@@ -195,7 +243,7 @@ open class ChartUtils
         NSUIGraphicsPopContext()
     }
     
-    internal class func drawMultilineText(context: CGContext, text: String, knownTextSize: CGSize, point: CGPoint, attributes: [String : AnyObject]?, constrainedToSize: CGSize, anchor: CGPoint, angleRadians: CGFloat)
+    internal class func drawMultilineText(context: CGContext, text: String, knownTextSize: CGSize, point: CGPoint, attributes: [NSAttributedString.Key : Any]?, constrainedToSize: CGSize, anchor: CGPoint, angleRadians: CGFloat)
     {
         var rect = CGRect(origin: CGPoint(), size: knownTextSize)
         
@@ -212,7 +260,7 @@ open class ChartUtils
             // Move the "outer" rect relative to the anchor, assuming its centered
             if anchor.x != 0.5 || anchor.y != 0.5
             {
-                let rotatedSize = sizeOfRotatedRectangle(knownTextSize, radians: angleRadians)
+                let rotatedSize = knownTextSize.rotatedBy(radians: angleRadians)
                 
                 translate.x -= rotatedSize.width * (anchor.x - 0.5)
                 translate.y -= rotatedSize.height * (anchor.y - 0.5)
@@ -243,115 +291,21 @@ open class ChartUtils
         NSUIGraphicsPopContext()
     }
     
-    internal class func drawMultilineText(context: CGContext, text: String, point: CGPoint, attributes: [String : AnyObject]?, constrainedToSize: CGSize, anchor: CGPoint, angleRadians: CGFloat)
+    internal class func drawMultilineText(context: CGContext, text: String, point: CGPoint, attributes: [NSAttributedString.Key : Any]?, constrainedToSize: CGSize, anchor: CGPoint, angleRadians: CGFloat)
     {
         let rect = text.boundingRect(with: constrainedToSize, options: .usesLineFragmentOrigin, attributes: attributes, context: nil)
         drawMultilineText(context: context, text: text, knownTextSize: rect.size, point: point, attributes: attributes, constrainedToSize: constrainedToSize, anchor: anchor, angleRadians: angleRadians)
     }
-    
-    /// - returns: An angle between 0.0 < 360.0 (not less than zero, less than 360)
-    internal class func normalizedAngleFromAngle(_ angle: CGFloat) -> CGFloat
-    {
-        var angle = angle
-        
-        while (angle < 0.0)
-        {
-            angle += 360.0
-        }
-        
-        return angle.truncatingRemainder(dividingBy: 360.0)
-    }
-    
-    fileprivate class func generateDefaultValueFormatter() -> IValueFormatter
+
+    private class func generateDefaultValueFormatter() -> IValueFormatter
     {
         let formatter = DefaultValueFormatter(decimals: 1)
         return formatter
     }
     
-    /// - returns: The default value formatter used for all chart components that needs a default
+    /// - Returns: The default value formatter used for all chart components that needs a default
     open class func defaultValueFormatter() -> IValueFormatter
     {
         return _defaultValueFormatter
     }
-    
-    internal class func sizeOfRotatedRectangle(_ rectangleSize: CGSize, degrees: CGFloat) -> CGSize
-    {
-        let radians = degrees * Math.FDEG2RAD
-        return sizeOfRotatedRectangle(rectangleWidth: rectangleSize.width, rectangleHeight: rectangleSize.height, radians: radians)
-    }
-    
-    internal class func sizeOfRotatedRectangle(_ rectangleSize: CGSize, radians: CGFloat) -> CGSize
-    {
-        return sizeOfRotatedRectangle(rectangleWidth: rectangleSize.width, rectangleHeight: rectangleSize.height, radians: radians)
-    }
-    
-    internal class func sizeOfRotatedRectangle(rectangleWidth: CGFloat, rectangleHeight: CGFloat, degrees: CGFloat) -> CGSize
-    {
-        let radians = degrees * Math.FDEG2RAD
-        return sizeOfRotatedRectangle(rectangleWidth: rectangleWidth, rectangleHeight: rectangleHeight, radians: radians)
-    }
-    
-    internal class func sizeOfRotatedRectangle(rectangleWidth: CGFloat, rectangleHeight: CGFloat, radians: CGFloat) -> CGSize
-    {
-        return CGSize(
-            width: abs(rectangleWidth * cos(radians)) + abs(rectangleHeight * sin(radians)),
-            height: abs(rectangleWidth * sin(radians)) + abs(rectangleHeight * cos(radians))
-        )
-    }
-    
-    /// MARK: - Bridging functions
-    
-    internal class func bridgedObjCGetNSUIColorArray (swift array: [NSUIColor?]) -> [NSObject]
-    {
-        var newArray = [NSObject]()
-        for val in array
-        {
-            if val == nil
-            {
-                newArray.append(NSNull())
-            }
-            else
-            {
-                newArray.append(val!)
-            }
-        }
-        return newArray
-    }
-    
-    internal class func bridgedObjCGetNSUIColorArray (objc array: [NSObject]) -> [NSUIColor?]
-    {
-        var newArray = [NSUIColor?]()
-        for object in array
-        {
-            newArray.append(object as? NSUIColor)
-        }
-        return newArray
-    }
-    
-    internal class func bridgedObjCGetStringArray (swift array: [String?]) -> [NSObject]
-    {
-        var newArray = [NSObject]()
-        for val in array
-        {
-            if val == nil
-            {
-                newArray.append(NSNull())
-            }
-            else
-            {
-                newArray.append(val! as NSObject)
-            }
-        }
-        return newArray
-    }
-    
-    internal class func bridgedObjCGetStringArray (objc array: [NSObject]) -> [String?]
-    {
-        var newArray = [String?]()
-        for object in array
-        {
-            newArray.append(object as? String)
-        }
-        return newArray
-    }
 }
diff --git a/Source/Charts/Utils/Fill.swift b/Source/Charts/Utils/Fill.swift
index cc347d813d..1294b3efc0 100644
--- a/Source/Charts/Utils/Fill.swift
+++ b/Source/Charts/Utils/Fill.swift
@@ -27,65 +27,65 @@ public enum FillType: Int
 @objc(ChartFill)
 open class Fill: NSObject
 {
-    fileprivate var _type: FillType = FillType.empty
-    fileprivate var _color: CGColor?
-    fileprivate var _gradient: CGGradient?
-    fileprivate var _gradientAngle: CGFloat = 0.0
-    fileprivate var _gradientStartOffsetPercent: CGPoint = CGPoint()
-    fileprivate var _gradientStartRadiusPercent: CGFloat = 0.0
-    fileprivate var _gradientEndOffsetPercent: CGPoint = CGPoint()
-    fileprivate var _gradientEndRadiusPercent: CGFloat = 0.0
-    fileprivate var _image: CGImage?
-    fileprivate var _layer: CGLayer?
+    private var _type: FillType = FillType.empty
+    private var _color: CGColor?
+    private var _gradient: CGGradient?
+    private var _gradientAngle: CGFloat = 0.0
+    private var _gradientStartOffsetPercent: CGPoint = CGPoint()
+    private var _gradientStartRadiusPercent: CGFloat = 0.0
+    private var _gradientEndOffsetPercent: CGPoint = CGPoint()
+    private var _gradientEndRadiusPercent: CGFloat = 0.0
+    private var _image: CGImage?
+    private var _layer: CGLayer?
     
     // MARK: Properties
     
-    open var type: FillType
+    @objc open var type: FillType
     {
         return _type
     }
     
-    open var color: CGColor?
+    @objc open var color: CGColor?
     {
         return _color
     }
     
-    open var gradient: CGGradient?
+    @objc open var gradient: CGGradient?
     {
         return _gradient
     }
     
-    open var gradientAngle: CGFloat
+    @objc open var gradientAngle: CGFloat
     {
         return _gradientAngle
     }
     
-    open var gradientStartOffsetPercent: CGPoint
+    @objc open var gradientStartOffsetPercent: CGPoint
     {
         return _gradientStartOffsetPercent
     }
     
-    open var gradientStartRadiusPercent: CGFloat
+    @objc open var gradientStartRadiusPercent: CGFloat
     {
         return _gradientStartRadiusPercent
     }
     
-    open var gradientEndOffsetPercent: CGPoint
+    @objc open var gradientEndOffsetPercent: CGPoint
     {
         return _gradientEndOffsetPercent
     }
     
-    open var gradientEndRadiusPercent: CGFloat
+    @objc open var gradientEndRadiusPercent: CGFloat
     {
         return _gradientEndRadiusPercent
     }
     
-    open var image: CGImage?
+    @objc open var image: CGImage?
     {
         return _image
     }
     
-    open var layer: CGLayer?
+    @objc open var layer: CGLayer?
     {
         return _layer
     }
@@ -96,25 +96,25 @@ open class Fill: NSObject
     {
     }
     
-    public init(CGColor: CGColor)
+    @objc public init(CGColor: CGColor)
     {
         _type = .color
         _color = CGColor
     }
     
-    public convenience init(color: NSUIColor)
+    @objc public convenience init(color: NSUIColor)
     {
         self.init(CGColor: color.cgColor)
     }
     
-    public init(linearGradient: CGGradient, angle: CGFloat)
+    @objc public init(linearGradient: CGGradient, angle: CGFloat)
     {
         _type = .linearGradient
         _gradient = linearGradient
         _gradientAngle = angle
     }
     
-    public init(
+    @objc public init(
         radialGradient: CGGradient,
         startOffsetPercent: CGPoint,
         startRadiusPercent: CGFloat,
@@ -130,7 +130,7 @@ open class Fill: NSObject
         _gradientEndRadiusPercent = endRadiusPercent
     }
     
-    public convenience init(radialGradient: CGGradient)
+    @objc public convenience init(radialGradient: CGGradient)
     {
         self.init(
             radialGradient: radialGradient,
@@ -141,28 +141,28 @@ open class Fill: NSObject
         )
     }
     
-    public init(CGImage: CGImage, tiled: Bool)
+    @objc public init(CGImage: CGImage, tiled: Bool)
     {
         _type = tiled ? .tiledImage : .image
         _image = CGImage
     }
     
-    public convenience init(image: NSUIImage, tiled: Bool)
+    @objc public convenience init(image: NSUIImage, tiled: Bool)
     {
         self.init(CGImage: image.cgImage!, tiled: tiled)
     }
     
-    public convenience init(CGImage: CGImage)
+    @objc public convenience init(CGImage: CGImage)
     {
         self.init(CGImage: CGImage, tiled: false)
     }
     
-    public convenience init(image: NSUIImage)
+    @objc public convenience init(image: NSUIImage)
     {
         self.init(image: image, tiled: false)
     }
     
-    public init(CGLayer: CGLayer)
+    @objc public init(CGLayer: CGLayer)
     {
         _type = .layer
         _layer = CGLayer
@@ -170,24 +170,24 @@ open class Fill: NSObject
     
     // MARK: Constructors
     
-    open class func fillWithCGColor(_ CGColor: CGColor) -> Fill
+    @objc open class func fillWithCGColor(_ CGColor: CGColor) -> Fill
     {
         return Fill(CGColor: CGColor)
     }
     
-    open class func fillWithColor(_ color: NSUIColor) -> Fill
+    @objc open class func fillWithColor(_ color: NSUIColor) -> Fill
     {
         return Fill(color: color)
     }
     
-    open class func fillWithLinearGradient(
+    @objc open class func fillWithLinearGradient(
         _ linearGradient: CGGradient,
         angle: CGFloat) -> Fill
     {
         return Fill(linearGradient: linearGradient, angle: angle)
     }
     
-    open class func fillWithRadialGradient(
+    @objc open class func fillWithRadialGradient(
         _ radialGradient: CGGradient,
         startOffsetPercent: CGPoint,
         startRadiusPercent: CGFloat,
@@ -204,32 +204,32 @@ open class Fill: NSObject
         )
     }
     
-    open class func fillWithRadialGradient(_ radialGradient: CGGradient) -> Fill
+    @objc open class func fillWithRadialGradient(_ radialGradient: CGGradient) -> Fill
     {
         return Fill(radialGradient: radialGradient)
     }
     
-    open class func fillWithCGImage(_ CGImage: CGImage, tiled: Bool) -> Fill
+    @objc open class func fillWithCGImage(_ CGImage: CGImage, tiled: Bool) -> Fill
     {
         return Fill(CGImage: CGImage, tiled: tiled)
     }
     
-    open class func fillWithImage(_ image: NSUIImage, tiled: Bool) -> Fill
+    @objc open class func fillWithImage(_ image: NSUIImage, tiled: Bool) -> Fill
     {
         return Fill(image: image, tiled: tiled)
     }
     
-    open class func fillWithCGImage(_ CGImage: CGImage) -> Fill
+    @objc open class func fillWithCGImage(_ CGImage: CGImage) -> Fill
     {
         return Fill(CGImage: CGImage)
     }
     
-    open class func fillWithImage(_ image: NSUIImage) -> Fill
+    @objc open class func fillWithImage(_ image: NSUIImage) -> Fill
     {
         return Fill(image: image)
     }
     
-    open class func fillWithCGLayer(_ CGLayer: CGLayer) -> Fill
+    @objc open class func fillWithCGLayer(_ CGLayer: CGLayer) -> Fill
     {
         return Fill(CGLayer: CGLayer)
     }
@@ -237,7 +237,7 @@ open class Fill: NSObject
     // MARK: Drawing code
     
     /// Draws the provided path in filled mode with the provided area
-    open func fillPath(
+    @objc open func fillPath(
         context: CGContext,
         rect: CGRect)
     {
@@ -273,7 +273,7 @@ open class Fill: NSObject
             
         case .linearGradient:
             
-            let radians = ChartUtils.Math.FDEG2RAD * (360.0 - _gradientAngle)
+            let radians = (360.0 - _gradientAngle).DEG2RAD
             let centerPoint = CGPoint(x: rect.midX, y: rect.midY)
             let xAngleDelta = cos(radians) * rect.width / 2.0
             let yAngleDelta = sin(radians) * rect.height / 2.0
diff --git a/Source/Charts/Utils/Platform+Accessibility.swift b/Source/Charts/Utils/Platform+Accessibility.swift
new file mode 100644
index 0000000000..35668eaba3
--- /dev/null
+++ b/Source/Charts/Utils/Platform+Accessibility.swift
@@ -0,0 +1,215 @@
+//
+//  Platform+Accessibility.swift
+//  Charts
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+import Foundation
+
+#if os(iOS) || os(tvOS)
+#if canImport(UIKit)
+    import UIKit
+#endif
+
+internal func accessibilityPostLayoutChangedNotification(withElement element: Any? = nil)
+{
+    UIAccessibility.post(notification: UIAccessibility.Notification.layoutChanged, argument: element)
+}
+
+internal func accessibilityPostScreenChangedNotification(withElement element: Any? = nil)
+{
+    UIAccessibility.post(notification: UIAccessibility.Notification.screenChanged, argument: element)
+}
+
+/// A simple abstraction over UIAccessibilityElement and NSAccessibilityElement.
+open class NSUIAccessibilityElement: UIAccessibilityElement
+{
+    private weak var containerView: UIView?
+
+    final var isHeader: Bool = false
+    {
+        didSet
+        {
+            accessibilityTraits = isHeader ? UIAccessibilityTraits.header : UIAccessibilityTraits.none
+        }
+    }
+
+    final var isSelected: Bool = false
+        {
+        didSet
+        {
+            accessibilityTraits = isSelected ? UIAccessibilityTraits.selected : UIAccessibilityTraits.none
+        }
+    }
+
+    override public init(accessibilityContainer container: Any)
+    {
+        // We can force unwrap since all chart views are subclasses of UIView
+        containerView = (container as! UIView)
+        super.init(accessibilityContainer: container)
+    }
+
+    override open var accessibilityFrame: CGRect
+    {
+        get
+        {
+            return super.accessibilityFrame
+        }
+
+        set
+        {
+            guard let containerView = containerView else { return }
+            super.accessibilityFrame = containerView.convert(newValue, to: UIScreen.main.coordinateSpace)
+        }
+    }
+}
+
+extension NSUIView
+{
+    /// An array of accessibilityElements that is used to implement UIAccessibilityContainer internally.
+    /// Subclasses **MUST** override this with an array of such elements.
+    @objc open func accessibilityChildren() -> [Any]?
+    {
+        return nil
+    }
+
+    public final override var isAccessibilityElement: Bool
+    {
+        get { return false } // Return false here, so we can make individual elements accessible
+        set { }
+    }
+
+    open override func accessibilityElementCount() -> Int
+    {
+        return accessibilityChildren()?.count ?? 0
+    }
+
+    open override func accessibilityElement(at index: Int) -> Any?
+    {
+        return accessibilityChildren()?[index]
+    }
+
+    open override func index(ofAccessibilityElement element: Any) -> Int
+    {
+        guard let axElement = element as? NSUIAccessibilityElement else { return NSNotFound }
+        return (accessibilityChildren() as? [NSUIAccessibilityElement])?
+            .firstIndex(of: axElement) ?? NSNotFound
+    }
+}
+
+#endif
+
+#if os(OSX)
+
+#if canImport(AppKit)
+import AppKit
+#endif
+
+internal func accessibilityPostLayoutChangedNotification(withElement element: Any? = nil)
+{
+    guard let validElement = element else { return }
+    NSAccessibility.post(element: validElement, notification: .layoutChanged)
+}
+
+internal func accessibilityPostScreenChangedNotification(withElement element: Any? = nil)
+{
+    // Placeholder
+}
+
+/// A simple abstraction over UIAccessibilityElement and NSAccessibilityElement.
+open class NSUIAccessibilityElement: NSAccessibilityElement
+{
+    private weak var containerView: NSView?
+
+    final var isHeader: Bool = false
+    {
+        didSet
+        {
+            setAccessibilityRole(isHeader ? .staticText : .none)
+        }
+    }
+
+    final var isSelected: Bool = false
+    {
+        didSet
+        {
+            setAccessibilitySelected(isSelected)
+        }
+    }
+
+    open var accessibilityLabel: String
+    {
+        get
+        {
+            return accessibilityLabel() ?? ""
+        }
+
+        set
+        {
+            setAccessibilityLabel(newValue)
+        }
+    }
+
+    open var accessibilityFrame: NSRect
+    {
+        get
+        {
+            return accessibilityFrame()
+        }
+
+        set
+        {
+            guard let containerView = containerView else { return }
+
+            let bounds = NSAccessibility.screenRect(fromView: containerView, rect: newValue)
+
+            // This works, but won't auto update if the window is resized or moved.
+            // setAccessibilityFrame(bounds)
+
+            // using FrameInParentSpace allows for automatic updating of frame when windows are moved and resized.
+            // However, there seems to be a bug right now where using it causes an offset in the frame.
+            // This is a slightly hacky workaround that calculates the offset and removes it from frame calculation.
+            setAccessibilityFrameInParentSpace(bounds)
+            let axFrame = accessibilityFrame()
+            let widthOffset = abs(axFrame.origin.x - bounds.origin.x)
+            let heightOffset = abs(axFrame.origin.y - bounds.origin.y)
+            let rect = NSRect(x: bounds.origin.x - widthOffset,
+                              y: bounds.origin.y - heightOffset,
+                              width: bounds.width,
+                              height: bounds.height)
+            setAccessibilityFrameInParentSpace(rect)
+        }
+    }
+
+    public init(accessibilityContainer container: Any)
+    {
+        // We can force unwrap since all chart views are subclasses of NSView
+        containerView = (container as! NSView)
+
+        super.init()
+
+        setAccessibilityParent(containerView)
+        setAccessibilityRole(.row)
+    }
+}
+
+/// - Note: setAccessibilityRole(.list) is called at init. See Platform.swift.
+extension NSUIView: NSAccessibilityGroup
+{
+    open override func accessibilityLabel() -> String?
+    {
+        return "Chart View"
+    }
+
+    open override func accessibilityRows() -> [Any]?
+    {
+        return accessibilityChildren()
+    }
+}
+
+#endif
diff --git a/Source/Charts/Utils/Platform+Color.swift b/Source/Charts/Utils/Platform+Color.swift
new file mode 100644
index 0000000000..02bff08ed4
--- /dev/null
+++ b/Source/Charts/Utils/Platform+Color.swift
@@ -0,0 +1,57 @@
+//
+//  Platform+Color.swift
+//  Charts
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+#if canImport(UIKit)
+import UIKit
+
+public typealias NSUIColor = UIColor
+private func fetchLabelColor() -> UIColor
+{
+    if #available(iOS 13, tvOS 13, *)
+    {
+        return .label
+    }
+    else
+    {
+        return .black
+    }
+}
+private let labelColor: UIColor = fetchLabelColor()
+
+extension UIColor
+{
+    static var labelOrBlack: UIColor { labelColor }
+}
+#endif
+
+#if canImport(AppKit) && !targetEnvironment(macCatalyst)
+
+import AppKit
+
+public typealias NSUIColor = NSColor
+private func fetchLabelColor() -> NSColor
+{
+    if #available(macOS 10.14, *)
+    {
+        return .labelColor
+    }
+    else
+    {
+        return .black
+    }
+}
+private let labelColor: NSColor = fetchLabelColor()
+
+extension NSColor
+{
+    static var labelOrBlack: NSColor { labelColor }
+}
+#endif
diff --git a/Source/Charts/Utils/Platform+Gestures.swift b/Source/Charts/Utils/Platform+Gestures.swift
new file mode 100644
index 0000000000..e22e168876
--- /dev/null
+++ b/Source/Charts/Utils/Platform+Gestures.swift
@@ -0,0 +1,172 @@
+//
+//  Platform+Gestures.swift
+//  Charts
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+// MARK: - UIKit
+#if canImport(UIKit)
+import UIKit
+
+public typealias NSUIGestureRecognizer = UIGestureRecognizer
+public typealias NSUIGestureRecognizerState = UIGestureRecognizer.State
+public typealias NSUIGestureRecognizerDelegate = UIGestureRecognizerDelegate
+public typealias NSUITapGestureRecognizer = UITapGestureRecognizer
+public typealias NSUIPanGestureRecognizer = UIPanGestureRecognizer
+
+extension NSUITapGestureRecognizer
+{
+    @objc final func nsuiNumberOfTouches() -> Int
+    {
+        return numberOfTouches
+    }
+
+    @objc final var nsuiNumberOfTapsRequired: Int
+        {
+        get
+        {
+            return self.numberOfTapsRequired
+        }
+        set
+        {
+            self.numberOfTapsRequired = newValue
+        }
+    }
+}
+
+extension NSUIPanGestureRecognizer
+{
+    @objc final func nsuiNumberOfTouches() -> Int
+    {
+        return numberOfTouches
+    }
+
+    @objc final func nsuiLocationOfTouch(_ touch: Int, inView: UIView?) -> CGPoint
+    {
+        return super.location(ofTouch: touch, in: inView)
+    }
+}
+
+#if !os(tvOS)
+public typealias NSUIPinchGestureRecognizer = UIPinchGestureRecognizer
+public typealias NSUIRotationGestureRecognizer = UIRotationGestureRecognizer
+
+extension NSUIRotationGestureRecognizer
+{
+    @objc final var nsuiRotation: CGFloat
+        {
+        get { return rotation }
+        set { rotation = newValue }
+    }
+}
+
+extension NSUIPinchGestureRecognizer
+{
+    @objc final var nsuiScale: CGFloat
+        {
+        get
+        {
+            return scale
+        }
+        set
+        {
+            scale = newValue
+        }
+    }
+
+    @objc final func nsuiLocationOfTouch(_ touch: Int, inView: UIView?) -> CGPoint
+    {
+        return super.location(ofTouch: touch, in: inView)
+    }
+}
+#endif
+#endif
+
+// MARK: - AppKit
+#if canImport(AppKit) && !targetEnvironment(macCatalyst)
+import AppKit
+
+public typealias NSUIGestureRecognizer = NSGestureRecognizer
+public typealias NSUIGestureRecognizerState = NSGestureRecognizer.State
+public typealias NSUIGestureRecognizerDelegate = NSGestureRecognizerDelegate
+public typealias NSUITapGestureRecognizer = NSClickGestureRecognizer
+public typealias NSUIPanGestureRecognizer = NSPanGestureRecognizer
+public typealias NSUIPinchGestureRecognizer = NSMagnificationGestureRecognizer
+public typealias NSUIRotationGestureRecognizer = NSRotationGestureRecognizer
+
+/** The 'tap' gesture is mapped to clicks. */
+extension NSUITapGestureRecognizer
+{
+    final func nsuiNumberOfTouches() -> Int
+    {
+        return 1
+    }
+
+    final var nsuiNumberOfTapsRequired: Int
+        {
+        get
+        {
+            return self.numberOfClicksRequired
+        }
+        set
+        {
+            self.numberOfClicksRequired = newValue
+        }
+    }
+}
+
+extension NSUIPanGestureRecognizer
+{
+    final func nsuiNumberOfTouches() -> Int
+    {
+        return 1
+    }
+
+    /// FIXME: Currently there are no more than 1 touch in OSX gestures, and not way to create custom touch gestures.
+    final func nsuiLocationOfTouch(_ touch: Int, inView: NSView?) -> NSPoint
+    {
+        return super.location(in: inView)
+    }
+}
+
+extension NSUIRotationGestureRecognizer
+{
+    /// FIXME: Currently there are no velocities in OSX gestures, and not way to create custom touch gestures.
+    final var velocity: CGFloat
+    {
+        return 0.1
+    }
+
+    final var nsuiRotation: CGFloat
+        {
+        get { return -rotation }
+        set { rotation = -newValue }
+    }
+}
+
+extension NSUIPinchGestureRecognizer
+{
+    final var nsuiScale: CGFloat
+        {
+        get
+        {
+            return magnification + 1.0
+        }
+        set
+        {
+            magnification = newValue - 1.0
+        }
+    }
+
+    /// FIXME: Currently there are no more than 1 touch in OSX gestures, and not way to create custom touch gestures.
+    final func nsuiLocationOfTouch(_ touch: Int, inView view: NSView?) -> NSPoint
+    {
+        return super.location(in: view)
+    }
+}
+#endif
diff --git a/Source/Charts/Utils/Platform+Graphics.swift b/Source/Charts/Utils/Platform+Graphics.swift
new file mode 100644
index 0000000000..6a72426978
--- /dev/null
+++ b/Source/Charts/Utils/Platform+Graphics.swift
@@ -0,0 +1,148 @@
+//
+//  Platform+Graphics.swift
+//  Charts
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+// MARK: - UIKit
+#if canImport(UIKit)
+import UIKit
+
+func NSUIGraphicsGetCurrentContext() -> CGContext?
+{
+    return UIGraphicsGetCurrentContext()
+}
+
+func NSUIGraphicsGetImageFromCurrentImageContext() -> NSUIImage!
+{
+    return UIGraphicsGetImageFromCurrentImageContext()
+}
+
+func NSUIGraphicsPushContext(_ context: CGContext)
+{
+    UIGraphicsPushContext(context)
+}
+
+func NSUIGraphicsPopContext()
+{
+    UIGraphicsPopContext()
+}
+
+func NSUIGraphicsEndImageContext()
+{
+    UIGraphicsEndImageContext()
+}
+
+func NSUIImagePNGRepresentation(_ image: NSUIImage) -> Data?
+{
+    return image.pngData()
+}
+
+func NSUIImageJPEGRepresentation(_ image: NSUIImage, _ quality: CGFloat = 0.8) -> Data?
+{
+    return image.jpegData(compressionQuality: quality)
+}
+
+func NSUIGraphicsBeginImageContextWithOptions(_ size: CGSize, _ opaque: Bool, _ scale: CGFloat)
+{
+    UIGraphicsBeginImageContextWithOptions(size, opaque, scale)
+}
+#endif
+
+// MARK: - AppKit
+#if canImport(AppKit) && !targetEnvironment(macCatalyst)
+import AppKit
+
+func NSUIGraphicsGetCurrentContext() -> CGContext?
+{
+    return NSGraphicsContext.current?.cgContext
+}
+
+func NSUIGraphicsPushContext(_ context: CGContext)
+{
+    let cx = NSGraphicsContext(cgContext: context, flipped: true)
+    NSGraphicsContext.saveGraphicsState()
+    NSGraphicsContext.current = cx
+}
+
+func NSUIGraphicsPopContext()
+{
+    NSGraphicsContext.restoreGraphicsState()
+}
+
+func NSUIImagePNGRepresentation(_ image: NSUIImage) -> Data?
+{
+    image.lockFocus()
+    let rep = NSBitmapImageRep(focusedViewRect: NSMakeRect(0, 0, image.size.width, image.size.height))
+    image.unlockFocus()
+    return rep?.representation(using: .png, properties: [:])
+}
+
+func NSUIImageJPEGRepresentation(_ image: NSUIImage, _ quality: CGFloat = 0.9) -> Data?
+{
+    image.lockFocus()
+    let rep = NSBitmapImageRep(focusedViewRect: NSMakeRect(0, 0, image.size.width, image.size.height))
+    image.unlockFocus()
+    return rep?.representation(using: .jpeg, properties: [NSBitmapImageRep.PropertyKey.compressionFactor: quality])
+}
+
+private var imageContextStack: [CGFloat] = []
+
+func NSUIGraphicsBeginImageContextWithOptions(_ size: CGSize, _ opaque: Bool, _ scale: CGFloat)
+{
+    var scale = scale
+    if scale == 0.0
+    {
+        scale = NSScreen.main?.backingScaleFactor ?? 1.0
+    }
+
+    let width = Int(size.width * scale)
+    let height = Int(size.height * scale)
+
+    if width > 0 && height > 0
+    {
+        imageContextStack.append(scale)
+
+        let colorSpace = CGColorSpaceCreateDeviceRGB()
+
+        guard let ctx = CGContext(data: nil, width: width, height: height, bitsPerComponent: 8, bytesPerRow: 4*width, space: colorSpace, bitmapInfo: (opaque ?  CGImageAlphaInfo.noneSkipFirst.rawValue : CGImageAlphaInfo.premultipliedFirst.rawValue))
+            else { return }
+
+        ctx.concatenate(CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: CGFloat(height)))
+        ctx.scaleBy(x: scale, y: scale)
+        NSUIGraphicsPushContext(ctx)
+    }
+}
+
+func NSUIGraphicsGetImageFromCurrentImageContext() -> NSUIImage?
+{
+    if !imageContextStack.isEmpty
+    {
+        guard let ctx = NSUIGraphicsGetCurrentContext()
+            else { return nil }
+
+        let scale = imageContextStack.last!
+        if let theCGImage = ctx.makeImage()
+        {
+            let size = CGSize(width: CGFloat(ctx.width) / scale, height: CGFloat(ctx.height) / scale)
+            let image = NSImage(cgImage: theCGImage, size: size)
+            return image
+        }
+    }
+    return nil
+}
+
+func NSUIGraphicsEndImageContext()
+{
+    if imageContextStack.last != nil
+    {
+        imageContextStack.removeLast()
+        NSUIGraphicsPopContext()
+    }
+}
+#endif
diff --git a/Source/Charts/Utils/Platform+Touch Handling.swift b/Source/Charts/Utils/Platform+Touch Handling.swift
new file mode 100644
index 0000000000..acb402ecb4
--- /dev/null
+++ b/Source/Charts/Utils/Platform+Touch Handling.swift	
@@ -0,0 +1,134 @@
+//
+//  Platform+Touch Handling.swift
+//  Charts
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+#if canImport(UIKit)
+import UIKit
+
+public typealias NSUIEvent = UIEvent
+public typealias NSUITouch = UITouch
+
+@objc
+extension NSUIView {
+    public final override func touchesBegan(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
+    {
+        self.nsuiTouchesBegan(touches, withEvent: event)
+    }
+
+    public final override func touchesMoved(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
+    {
+        self.nsuiTouchesMoved(touches, withEvent: event)
+    }
+
+    public final override func touchesEnded(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
+    {
+        self.nsuiTouchesEnded(touches, withEvent: event)
+    }
+
+    public final override func touchesCancelled(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
+    {
+        self.nsuiTouchesCancelled(touches, withEvent: event)
+    }
+
+    open func nsuiTouchesBegan(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
+    {
+        super.touchesBegan(touches, with: event!)
+    }
+
+    open func nsuiTouchesMoved(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
+    {
+        super.touchesMoved(touches, with: event!)
+    }
+
+    open func nsuiTouchesEnded(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
+    {
+        super.touchesEnded(touches, with: event!)
+    }
+
+    open func nsuiTouchesCancelled(_ touches: Set<NSUITouch>?, withEvent event: NSUIEvent?)
+    {
+        super.touchesCancelled(touches!, with: event!)
+    }
+}
+
+extension UIView
+{
+    @objc final var nsuiGestureRecognizers: [NSUIGestureRecognizer]?
+    {
+        return self.gestureRecognizers
+    }
+}
+#endif
+
+
+#if canImport(AppKit) && !targetEnvironment(macCatalyst)
+import AppKit
+
+public typealias NSUIEvent = NSEvent
+public typealias NSUITouch = NSTouch
+
+@objc
+extension NSUIView
+{
+    public final override func touchesBegan(with event: NSEvent)
+    {
+        self.nsuiTouchesBegan(event.touches(matching: .any, in: self), withEvent: event)
+    }
+
+    public final override func touchesEnded(with event: NSEvent)
+    {
+        self.nsuiTouchesEnded(event.touches(matching: .any, in: self), withEvent: event)
+    }
+
+    public final override func touchesMoved(with event: NSEvent)
+    {
+        self.nsuiTouchesMoved(event.touches(matching: .any, in: self), withEvent: event)
+    }
+
+    open override func touchesCancelled(with event: NSEvent)
+    {
+        self.nsuiTouchesCancelled(event.touches(matching: .any, in: self), withEvent: event)
+    }
+
+    open func nsuiTouchesBegan(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
+    {
+        super.touchesBegan(with: event!)
+    }
+
+    open func nsuiTouchesMoved(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
+    {
+        super.touchesMoved(with: event!)
+    }
+
+    open func nsuiTouchesEnded(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
+    {
+        super.touchesEnded(with: event!)
+    }
+
+    open func nsuiTouchesCancelled(_ touches: Set<NSUITouch>?, withEvent event: NSUIEvent?)
+    {
+        super.touchesCancelled(with: event!)
+    }
+}
+
+extension NSTouch
+{
+    /** Touch locations on OS X are relative to the trackpad, whereas on iOS they are actually *on* the view. */
+    func locationInView(view: NSView) -> NSPoint
+    {
+        let n = self.normalizedPosition
+        let b = view.bounds
+        return NSPoint(
+            x: b.origin.x + b.size.width * n.x,
+            y: b.origin.y + b.size.height * n.y
+        )
+    }
+}
+#endif
diff --git a/Source/Charts/Utils/Platform.swift b/Source/Charts/Utils/Platform.swift
index ec3963b6f6..19fdbf7eec 100644
--- a/Source/Charts/Utils/Platform.swift
+++ b/Source/Charts/Utils/Platform.swift
@@ -1,624 +1,245 @@
 import Foundation
 
 /** This file provides a thin abstraction layer atop of UIKit (iOS, tvOS) and Cocoa (OS X). The two APIs are very much 
-alike, and for the chart library's usage of the APIs it is often sufficient to typealias one to the other. The NSUI*
-types are aliased to either their UI* implementation (on iOS) or their NS* implementation (on OS X). */
+ alike, and for the chart library's usage of the APIs it is often sufficient to typealias one to the other. The NSUI*
+ types are aliased to either their UI* implementation (on iOS) or their NS* implementation (on OS X). */
 #if os(iOS) || os(tvOS)
-	import UIKit
-	
-	public typealias NSUIFont = UIFont
-	public typealias NSUIColor = UIColor
-	public typealias NSUIEvent = UIEvent
-	public typealias NSUITouch = UITouch
-	public typealias NSUIImage = UIImage
-	public typealias NSUIScrollView = UIScrollView
-	public typealias NSUIGestureRecognizer = UIGestureRecognizer
-	public typealias NSUIGestureRecognizerState = UIGestureRecognizerState
-	public typealias NSUIGestureRecognizerDelegate = UIGestureRecognizerDelegate
-	public typealias NSUITapGestureRecognizer = UITapGestureRecognizer
-	public typealias NSUIPanGestureRecognizer = UIPanGestureRecognizer
-#if !os(tvOS)
-    public typealias NSUIPinchGestureRecognizer = UIPinchGestureRecognizer
-    public typealias NSUIRotationGestureRecognizer = UIRotationGestureRecognizer
+#if canImport(UIKit)
+    import UIKit
 #endif
-    public typealias NSUIScreen = UIScreen
 
-	public typealias NSUIDisplayLink = CADisplayLink
-    
-    extension NSUITapGestureRecognizer
-    {
-        final func nsuiNumberOfTouches() -> Int
-        {
-            return numberOfTouches
-        }
-        
-        final var nsuiNumberOfTapsRequired: Int
-        {
-            get
-            {
-                return self.numberOfTapsRequired
-            }
-            set
-            {
-                self.numberOfTapsRequired = newValue
-            }
-        }
-    }
-    
-    extension NSUIPanGestureRecognizer
-    {
-        final func nsuiNumberOfTouches() -> Int
-        {
-            return numberOfTouches
-        }
-        
-        final func nsuiLocationOfTouch(_ touch: Int, inView: UIView?) -> CGPoint
-        {
-            return super.location(ofTouch: touch, in: inView)
-        }
-    }
-    
-#if !os(tvOS)
-    extension NSUIRotationGestureRecognizer
-    {
-        final var nsuiRotation: CGFloat
-        {
-            get { return rotation }
-            set { rotation = newValue }
-        }
-    }
-#endif
-    
-#if !os(tvOS)
-    extension NSUIPinchGestureRecognizer
-    {
-        final var nsuiScale: CGFloat
-        {
-            get
-            {
-                return scale
-            }
-            set
-            {
-                scale = newValue
-            }
-        }
-        
-        final func nsuiLocationOfTouch(_ touch: Int, inView: UIView?) -> CGPoint
-        {
-            return super.location(ofTouch: touch, in: inView)
-        }
-    }
-#endif
+public typealias NSUIFont = UIFont
+public typealias NSUIImage = UIImage
+public typealias NSUIScrollView = UIScrollView
+public typealias NSUIScreen = UIScreen
+public typealias NSUIDisplayLink = CADisplayLink
 
-	open class NSUIView: UIView
+open class NSUIView: UIView
+{
+    @objc var nsuiLayer: CALayer?
     {
-		public final override func touchesBegan(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
-        {
-			self.nsuiTouchesBegan(touches, withEvent: event)
-		}
-
-		public final override func touchesMoved(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
-        {
-			self.nsuiTouchesMoved(touches, withEvent: event)
-		}
-
-		public final override func touchesEnded(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
-        {
-			self.nsuiTouchesEnded(touches, withEvent: event)
-		}
-
-		public final override func touchesCancelled(_ touches: Set<NSUITouch>, with event: NSUIEvent?)
-        {
-			self.nsuiTouchesCancelled(touches, withEvent: event)
-		}
-
-		open func nsuiTouchesBegan(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
-        {
-			super.touchesBegan(touches, with: event!)
-		}
-
-		open func nsuiTouchesMoved(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
-        {
-			super.touchesMoved(touches, with: event!)
-		}
-
-		open func nsuiTouchesEnded(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
-        {
-			super.touchesEnded(touches, with: event!)
-		}
-
-		open func nsuiTouchesCancelled(_ touches: Set<NSUITouch>?, withEvent event: NSUIEvent?)
-        {
-			super.touchesCancelled(touches!, with: event!)
-		}
-
-		var nsuiLayer: CALayer?
-        {
-			return self.layer
-		}
-	}
+        return self.layer
+    }
+}
 
-	extension UIView
-    {
-		final var nsuiGestureRecognizers: [NSUIGestureRecognizer]?
+extension UIScrollView
+{
+    @objc var nsuiIsScrollEnabled: Bool
         {
-			return self.gestureRecognizers
-		}
+        get { return isScrollEnabled }
+        set { isScrollEnabled = newValue }
     }
-    
-    extension UIScrollView
+}
+
+extension UIScreen
+{
+    @objc final var nsuiScale: CGFloat
     {
-        var nsuiIsScrollEnabled: Bool
-        {
-            get { return isScrollEnabled }
-            set { isScrollEnabled = newValue }
-        }
-    }
-    
-    extension UIScreen
-    {
-        final var nsuiScale: CGFloat
-        {
-            return self.scale
-        }
+        return self.scale
     }
+}
 
-    func NSUIGraphicsGetCurrentContext() -> CGContext?
-    {
-		return UIGraphicsGetCurrentContext()
-	}
+func NSUIMainScreen() -> NSUIScreen?
+{
+    return NSUIScreen.main
+}
 
-    func NSUIGraphicsGetImageFromCurrentImageContext() -> NSUIImage!
-    {
-		return UIGraphicsGetImageFromCurrentImageContext()
-	}
+#endif
 
-	func NSUIGraphicsPushContext(_ context: CGContext)
-    {
-		UIGraphicsPushContext(context)
-	}
+#if os(OSX)
+import Cocoa
+import Quartz
 
-	func NSUIGraphicsPopContext()
-    {
-		UIGraphicsPopContext()
-	}
+public typealias NSUIFont = NSFont
+public typealias NSUIImage = NSImage
+public typealias NSUIScrollView = NSScrollView
+public typealias NSUIScreen = NSScreen
 
-	func NSUIGraphicsEndImageContext()
-    {
-		UIGraphicsEndImageContext()
-	}
+/** On OS X there is no CADisplayLink. Use a 60 fps timer to render the animations. */
+public class NSUIDisplayLink
+{
+    private var timer: Timer?
+    private var displayLink: CVDisplayLink?
+    private var _timestamp: CFTimeInterval = 0.0
 
-	func NSUIImagePNGRepresentation(_ image: NSUIImage) -> Data?
-    {
-		return UIImagePNGRepresentation(image)
-	}
+    private weak var _target: AnyObject?
+    private var _selector: Selector
 
-	func NSUIImageJPEGRepresentation(_ image: NSUIImage, _ quality: CGFloat = 0.8) -> Data?
+    public var timestamp: CFTimeInterval
     {
-		return UIImageJPEGRepresentation(image, quality)
-	}
-
-	func NSUIMainScreen() -> NSUIScreen?
-    {
-		return NSUIScreen.main
-	}
+        return _timestamp
+    }
 
-	func NSUIGraphicsBeginImageContextWithOptions(_ size: CGSize, _ opaque: Bool, _ scale: CGFloat)
+		init(target: Any, selector: Selector)
     {
-		UIGraphicsBeginImageContextWithOptions(size, opaque, scale)
-	}
-
-#endif
+        _target = target as AnyObject
+        _selector = selector
 
-#if os(OSX)
-	import Cocoa
-	import Quartz
-
-	public typealias NSUIFont = NSFont
-	public typealias NSUIColor = NSColor
-	public typealias NSUIEvent = NSEvent
-	public typealias NSUITouch = NSTouch
-	public typealias NSUIImage = NSImage
-	public typealias NSUIScrollView = NSScrollView
-	public typealias NSUIGestureRecognizer = NSGestureRecognizer
-	public typealias NSUIGestureRecognizerState = NSGestureRecognizerState
-	public typealias NSUIGestureRecognizerDelegate = NSGestureRecognizerDelegate
-	public typealias NSUITapGestureRecognizer = NSClickGestureRecognizer
-	public typealias NSUIPanGestureRecognizer = NSPanGestureRecognizer
-	public typealias NSUIPinchGestureRecognizer = NSMagnificationGestureRecognizer
-	public typealias NSUIRotationGestureRecognizer = NSRotationGestureRecognizer
-	public typealias NSUIScreen = NSScreen
-
-	/** On OS X there is no CADisplayLink. Use a 60 fps timer to render the animations. */
-	public class NSUIDisplayLink
-    {
-        private var timer: Timer?
-        private var displayLink: CVDisplayLink?
-        private var _timestamp: CFTimeInterval = 0.0
-        
-        private weak var _target: AnyObject?
-        private var _selector: Selector
-        
-        public var timestamp: CFTimeInterval
+        if CVDisplayLinkCreateWithActiveCGDisplays(&displayLink) == kCVReturnSuccess
         {
-            return _timestamp
-        }
 
-		init(target: AnyObject, selector: Selector)
-        {
-            _target = target
-            _selector = selector
-            
-            if CVDisplayLinkCreateWithActiveCGDisplays(&displayLink) == kCVReturnSuccess
-            {
-                
-                CVDisplayLinkSetOutputCallback(displayLink!, { (displayLink, inNow, inOutputTime, flagsIn, flagsOut, userData) -> CVReturn in
-                    
-                    let _self = unsafeBitCast(userData, to: NSUIDisplayLink.self)
+            CVDisplayLinkSetOutputCallback(displayLink!, { (displayLink, inNow, inOutputTime, flagsIn, flagsOut, userData) -> CVReturn in
+
+                let _self = unsafeBitCast(userData, to: NSUIDisplayLink.self)
                     
-                    _self._timestamp = CFAbsoluteTimeGetCurrent()
-                    _self._target?.performSelector(onMainThread: _self._selector, with: _self, waitUntilDone: false)
+                _self._timestamp = CFAbsoluteTimeGetCurrent()
+                _self._target?.performSelector(onMainThread: _self._selector, with: _self, waitUntilDone: false)
                     
-                    return kCVReturnSuccess
-                    }, Unmanaged.passUnretained(self).toOpaque())
-            }
-            else
-            {
-                timer = Timer(timeInterval: 1.0 / 60.0, target: target, selector: selector, userInfo: nil, repeats: true)
-            }
-		}
-        
-        deinit
-        {
-            stop()
+                return kCVReturnSuccess
+                }, Unmanaged.passUnretained(self).toOpaque())
         }
-
-		open func add(to runloop: RunLoop, forMode mode: RunLoopMode)
-        {
-            if displayLink != nil
-            {
-                CVDisplayLinkStart(displayLink!)
-            }
-            else if timer != nil
-            {
-                runloop.add(timer!, forMode: mode)
-            }
-		}
-
-		open func remove(from: RunLoop, forMode: RunLoopMode)
+        else
         {
-            stop()
-		}
-        
-        private func stop()
-        {
-            if displayLink != nil
-            {
-                CVDisplayLinkStop(displayLink!)
-            }
-            if timer != nil
-            {
-                timer?.invalidate()
-            }
+            timer = Timer(timeInterval: 1.0 / 60.0, target: target, selector: selector, userInfo: nil, repeats: true)
         }
-	}
-
-	/** The 'tap' gesture is mapped to clicks. */
-	extension NSUITapGestureRecognizer
-    {
-		final func nsuiNumberOfTouches() -> Int
-        {
-			return 1
 		}
-        
-		final var nsuiNumberOfTapsRequired: Int
-        {
-			get
-            {
-				return self.numberOfClicksRequired
-			}
-			set
-            {
-				self.numberOfClicksRequired = newValue
-			}
-		}
-	}
 
-	extension NSUIPanGestureRecognizer
+    deinit
     {
-		final func nsuiNumberOfTouches() -> Int
-        {
-			return 1
-		}
-        
-        /// FIXME: Currently there are no more than 1 touch in OSX gestures, and not way to create custom touch gestures.
-		final func nsuiLocationOfTouch(_ touch: Int, inView: NSView?) -> NSPoint
-        {
-			return super.location(in: inView)
-		}
+        stop()
     }
-    
-    extension NSUIRotationGestureRecognizer
+
+    open func add(to runloop: RunLoop, forMode mode: RunLoop.Mode)
     {
-        /// FIXME: Currently there are no velocities in OSX gestures, and not way to create custom touch gestures.
-        final var velocity: CGFloat
+        if displayLink != nil
         {
-            return 0.1
+            CVDisplayLinkStart(displayLink!)
         }
-        
-        final var nsuiRotation: CGFloat
+        else if timer != nil
         {
-            get { return -rotation }
-            set { rotation = -newValue }
+            runloop.add(timer!, forMode: mode)
         }
     }
-    
-    extension NSUIPinchGestureRecognizer
+
+    open func remove(from: RunLoop, forMode: RunLoop.Mode)
+    {
+        stop()
+    }
+
+    private func stop()
     {
-        final var nsuiScale: CGFloat
+        if displayLink != nil
         {
-            get
-            {
-                return magnification + 1.0
-            }
-            set
-            {
-                magnification = newValue - 1.0
-            }
+            CVDisplayLinkStop(displayLink!)
         }
-        
-        /// FIXME: Currently there are no more than 1 touch in OSX gestures, and not way to create custom touch gestures.
-        final func nsuiLocationOfTouch(_ touch: Int, inView view: NSView?) -> NSPoint
+        if timer != nil
         {
-            return super.location(in: view)
+            timer?.invalidate()
         }
     }
+}
 
-	extension NSView
+extension NSView
+{
+    final var nsuiGestureRecognizers: [NSGestureRecognizer]?
     {
-		final var nsuiGestureRecognizers: [NSGestureRecognizer]?
-        {
-			return self.gestureRecognizers
-		}
-	}
+        return self.gestureRecognizers
+    }
+}
 
-    extension NSScrollView
+extension NSScrollView
+{
+    var nsuiIsScrollEnabled: Bool
     {
-        var nsuiIsScrollEnabled: Bool
-        {
-            get { return scrollEnabled }
-            set { scrollEnabled = newValue }
-        }
+        get { return scrollEnabled }
+        set { scrollEnabled = newValue }
     }
-    
-	open class NSUIView: NSView
-    {
-		public final override var isFlipped: Bool
-        {
-			return true
-		}
-
-		func setNeedsDisplay()
-        {
-			self.setNeedsDisplay(self.bounds)
-		}
-
-        
-		public final override func touchesBegan(with event: NSEvent)
-        {
-			self.nsuiTouchesBegan(event.touches(matching: .any, in: self), withEvent: event)
-		}
-
-		public final override func touchesEnded(with event: NSEvent)
-        {
-			self.nsuiTouchesEnded(event.touches(matching: .any, in: self), withEvent: event)
-		}
-
-		public final override func touchesMoved(with event: NSEvent)
-        {
-			self.nsuiTouchesMoved(event.touches(matching: .any, in: self), withEvent: event)
-		}
-
-		open override func touchesCancelled(with event: NSEvent)
-        {
-			self.nsuiTouchesCancelled(event.touches(matching: .any, in: self), withEvent: event)
-		}
-
-		open func nsuiTouchesBegan(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
-        {
-			super.touchesBegan(with: event!)
-		}
-
-		open func nsuiTouchesMoved(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
-        {
-			super.touchesMoved(with: event!)
-		}
-
-		open func nsuiTouchesEnded(_ touches: Set<NSUITouch>, withEvent event: NSUIEvent?)
-        {
-			super.touchesEnded(with: event!)
-		}
-
-		open func nsuiTouchesCancelled(_ touches: Set<NSUITouch>?, withEvent event: NSUIEvent?)
-        {
-			super.touchesCancelled(with: event!)
-        }
-        
-		open var backgroundColor: NSUIColor?
-        {
-            get
-            {
-                return self.layer?.backgroundColor == nil
-                    ? nil
-                    : NSColor(cgColor: self.layer!.backgroundColor!)
-            }
-            set
-            {
-                self.wantsLayer = true
-                self.layer?.backgroundColor = newValue == nil ? nil : newValue!.cgColor
-            }
-        }
+}
 
-		final var nsuiLayer: CALayer?
-        {
-			return self.layer
-		}
-	}
+open class NSUIView: NSView
+{
+    /// A private constant to set the accessibility role during initialization.
+    /// It ensures parity with the iOS element ordering as well as numbered counts of chart components.
+    /// (See Platform+Accessibility for details)
+    private let role: NSAccessibility.Role = .list
 
-	extension NSFont
+    public override init(frame frameRect: NSRect)
     {
-		var lineHeight: CGFloat
-        {
-			// Not sure if this is right, but it looks okay
-			return self.boundingRectForFont.size.height
-		}
-	}
+        super.init(frame: frameRect)
+        setAccessibilityRole(role)
+    }
 
-	extension NSScreen
+    required public init?(coder decoder: NSCoder)
     {
-		final var nsuiScale: CGFloat
-        {
-			return self.backingScaleFactor
-		}
-	}
+        super.init(coder: decoder)
+        setAccessibilityRole(role)
+    }
 
-	extension NSImage
+    public final override var isFlipped: Bool
     {
-		var cgImage: CGImage?
-        {
-            return self.cgImage(forProposedRect: nil, context: nil, hints: nil)
-		}
-	}
+        return true
+    }
 
-	extension NSTouch
+    func setNeedsDisplay()
     {
-		/** Touch locations on OS X are relative to the trackpad, whereas on iOS they are actually *on* the view. */
-		func locationInView(view: NSView) -> NSPoint
-        {
-			let n = self.normalizedPosition
-			let b = view.bounds
-			return NSPoint(x: b.origin.x + b.size.width * n.x, y: b.origin.y + b.size.height * n.y)
-		}
-	}
+        self.setNeedsDisplay(self.bounds)
+    }
 
-	extension NSScrollView
-    {
-		var scrollEnabled: Bool
+
+    open var backgroundColor: NSUIColor?
         {
-			get
-            {
-				return true
-			}
-            set
-            {
-                // FIXME: We can't disable  scrolling it on OSX
-            }
-		}
-    }
-    
-    extension NSString
-    {
-        // iOS: size(attributes: ...), OSX: size(withAttributes: ...)
-        // Both are translated into sizeWithAttributes: on ObjC. So conflict...
-        @nonobjc
-        func size(attributes attrs: [String : Any]? = nil) -> NSSize
+        get
+        {
+            return self.layer?.backgroundColor == nil
+                ? nil
+                : NSColor(cgColor: self.layer!.backgroundColor!)
+        }
+        set
         {
-            return size(withAttributes: attrs)
+            self.wantsLayer = true
+            self.layer?.backgroundColor = newValue == nil ? nil : newValue!.cgColor
         }
     }
 
-	func NSUIGraphicsGetCurrentContext() -> CGContext?
+    final var nsuiLayer: CALayer?
     {
-		return NSGraphicsContext.current()?.cgContext
-	}
-
-	func NSUIGraphicsPushContext(_ context: CGContext)
-    {
-        let cx = NSGraphicsContext(cgContext: context, flipped: true)
-		NSGraphicsContext.saveGraphicsState()
-		NSGraphicsContext.setCurrent(cx)
-	}
+        return self.layer
+    }
+}
 
-	func NSUIGraphicsPopContext()
+extension NSFont
+{
+    var lineHeight: CGFloat
     {
-		NSGraphicsContext.restoreGraphicsState()
-	}
+        // Not sure if this is right, but it looks okay
+        return self.boundingRectForFont.size.height
+    }
+}
 
-	func NSUIImagePNGRepresentation(_ image: NSUIImage) -> Data?
+extension NSScreen
+{
+    final var nsuiScale: CGFloat
     {
-		image.lockFocus()
-		let rep = NSBitmapImageRep(focusedViewRect: NSMakeRect(0, 0, image.size.width, image.size.height))
-		image.unlockFocus()
-		return rep?.representation(using: NSPNGFileType, properties: [:])
-	}
+        return self.backingScaleFactor
+    }
+}
 
-	func NSUIImageJPEGRepresentation(_ image: NSUIImage, _ quality: CGFloat = 0.9) -> Data?
+extension NSImage
+{
+    var cgImage: CGImage?
     {
-		image.lockFocus()
-		let rep = NSBitmapImageRep(focusedViewRect: NSMakeRect(0, 0, image.size.width, image.size.height))
-		image.unlockFocus()
-        return rep?.representation(using: NSJPEGFileType, properties: [NSImageCompressionFactor: quality])
-	}
-
-	private var imageContextStack: [CGFloat] = []
+        return self.cgImage(forProposedRect: nil, context: nil, hints: nil)
+    }
+}
 
-	func NSUIGraphicsBeginImageContextWithOptions(_ size: CGSize, _ opaque: Bool, _ scale: CGFloat)
+extension NSScrollView
+{
+    /// NOTE: Unable to disable scrolling in macOS
+    var scrollEnabled: Bool
     {
-		var scale = scale
-		if scale == 0.0
-        {
-			scale = NSScreen.main()?.backingScaleFactor ?? 1.0
-		}
-
-		let width = Int(size.width * scale)
-		let height = Int(size.height * scale)
-
-		if width > 0 && height > 0
+        get
         {
-			imageContextStack.append(scale)
-
-			let colorSpace = CGColorSpaceCreateDeviceRGB()
-            
-			guard let ctx = CGContext(data: nil, width: width, height: height, bitsPerComponent: 8, bytesPerRow: 4*width, space: colorSpace, bitmapInfo: (opaque ?  CGImageAlphaInfo.noneSkipFirst.rawValue : CGImageAlphaInfo.premultipliedFirst.rawValue))
-                else { return }
-            
-			ctx.concatenate(CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: CGFloat(height)))
-			ctx.scaleBy(x: scale, y: scale)
-			NSUIGraphicsPushContext(ctx)
-		}
-	}
-
-	func NSUIGraphicsGetImageFromCurrentImageContext() -> NSUIImage?
-    {
-		if !imageContextStack.isEmpty
+            return true
+        }
+        set
         {
-			guard let ctx = NSUIGraphicsGetCurrentContext()
-                else { return nil }
-            
-			let scale = imageContextStack.last!
-			if let theCGImage = ctx.makeImage()
-            {
-                let size = CGSize(width: CGFloat(ctx.width) / scale, height: CGFloat(ctx.height) / scale)
-				let image = NSImage(cgImage: theCGImage, size: size)
-				return image
-			}
-		}
-		return nil
-	}
+        }
+    }
+}
 
-	func NSUIGraphicsEndImageContext()
-    {
-		if imageContextStack.last != nil
-        {
-			imageContextStack.removeLast()
-			NSUIGraphicsPopContext()
-		}
-	}
+func NSUIMainScreen() -> NSUIScreen?
+{
+    return NSUIScreen.main
+}
 
-	func NSUIMainScreen() -> NSUIScreen?
-    {
-		return NSUIScreen.main()
-	}
-    
 #endif
diff --git a/Source/Charts/Utils/Transformer.swift b/Source/Charts/Utils/Transformer.swift
index ecf4c51055..b50ea823c5 100644
--- a/Source/Charts/Utils/Transformer.swift
+++ b/Source/Charts/Utils/Transformer.swift
@@ -24,13 +24,13 @@ open class Transformer: NSObject
 
     internal var _viewPortHandler: ViewPortHandler
 
-    public init(viewPortHandler: ViewPortHandler)
+    @objc public init(viewPortHandler: ViewPortHandler)
     {
         _viewPortHandler = viewPortHandler
     }
 
     /// Prepares the matrix that transforms values to pixels. Calculates the scale factors from the charts size and offsets.
-    open func prepareMatrixValuePx(chartXMin: Double, deltaX: CGFloat, deltaY: CGFloat, chartYMin: Double)
+    @objc open func prepareMatrixValuePx(chartXMin: Double, deltaX: CGFloat, deltaY: CGFloat, chartYMin: Double)
     {
         var scaleX = (_viewPortHandler.contentWidth / deltaX)
         var scaleY = (_viewPortHandler.contentHeight / deltaY)
@@ -51,7 +51,7 @@ open class Transformer: NSObject
     }
 
     /// Prepares the matrix that contains all offsets.
-    open func prepareMatrixOffset(inverted: Bool)
+    @objc open func prepareMatrixOffset(inverted: Bool)
     {
         if !inverted
         {
@@ -69,10 +69,7 @@ open class Transformer: NSObject
     open func pointValuesToPixel(_ points: inout [CGPoint])
     {
         let trans = valueToPixelMatrix
-        for i in 0 ..< points.count
-        {
-            points[i] = points[i].applying(trans)
-        }
+        points = points.map { $0.applying(trans) }
     }
     
     open func pointValueToPixel(_ point: inout CGPoint)
@@ -80,7 +77,7 @@ open class Transformer: NSObject
         point = point.applying(valueToPixelMatrix)
     }
     
-    open func pixelForValues(x: Double, y: Double) -> CGPoint
+    @objc open func pixelForValues(x: Double, y: Double) -> CGPoint
     {
         return CGPoint(x: x, y: y).applying(valueToPixelMatrix)
     }
@@ -126,22 +123,14 @@ open class Transformer: NSObject
     open func rectValuesToPixel(_ rects: inout [CGRect])
     {
         let trans = valueToPixelMatrix
-        
-        for i in 0 ..< rects.count
-        {
-            rects[i] = rects[i].applying(trans)
-        }
+        rects = rects.map { $0.applying(trans) }
     }
     
     /// Transforms the given array of touch points (pixels) into values on the chart.
     open func pixelsToValues(_ pixels: inout [CGPoint])
     {
         let trans = pixelToValueMatrix
-        
-        for i in 0 ..< pixels.count
-        {
-            pixels[i] = pixels[i].applying(trans)
-        }
+        pixels = pixels.map { $0.applying(trans) }
     }
     
     /// Transforms the given touch point (pixels) into a value on the chart.
@@ -150,23 +139,23 @@ open class Transformer: NSObject
         pixel = pixel.applying(pixelToValueMatrix)
     }
     
-    /// - returns: The x and y values in the chart at the given touch point
+    /// - Returns: The x and y values in the chart at the given touch point
     /// (encapsulated in a CGPoint). This method transforms pixel coordinates to
     /// coordinates / values in the chart.
-    open func valueForTouchPoint(_ point: CGPoint) -> CGPoint
+    @objc open func valueForTouchPoint(_ point: CGPoint) -> CGPoint
     {
         return point.applying(pixelToValueMatrix)
     }
     
-    /// - returns: The x and y values in the chart at the given touch point
+    /// - Returns: The x and y values in the chart at the given touch point
     /// (x/y). This method transforms pixel coordinates to
     /// coordinates / values in the chart.
-    open func valueForTouchPoint(x: CGFloat, y: CGFloat) -> CGPoint
+    @objc open func valueForTouchPoint(x: CGFloat, y: CGFloat) -> CGPoint
     {
         return CGPoint(x: x, y: y).applying(pixelToValueMatrix)
     }
     
-    open var valueToPixelMatrix: CGAffineTransform
+    @objc open var valueToPixelMatrix: CGAffineTransform
     {
         return
             _matrixValueToPx.concatenating(_viewPortHandler.touchMatrix
@@ -174,7 +163,7 @@ open class Transformer: NSObject
         )
     }
     
-    open var pixelToValueMatrix: CGAffineTransform
+    @objc open var pixelToValueMatrix: CGAffineTransform
     {
         return valueToPixelMatrix.inverted()
     }
diff --git a/Source/Charts/Utils/ViewPortHandler.swift b/Source/Charts/Utils/ViewPortHandler.swift
index d57c98f00b..8916d068a8 100755
--- a/Source/Charts/Utils/ViewPortHandler.swift
+++ b/Source/Charts/Utils/ViewPortHandler.swift
@@ -17,57 +17,53 @@ import CoreGraphics
 open class ViewPortHandler: NSObject
 {
     /// matrix used for touch events
-    fileprivate var _touchMatrix = CGAffineTransform.identity
+    private var _touchMatrix = CGAffineTransform.identity
     
     /// this rectangle defines the area in which graph values can be drawn
-    fileprivate var _contentRect = CGRect()
+    private var _contentRect = CGRect()
     
-    fileprivate var _chartWidth = CGFloat(0.0)
-    fileprivate var _chartHeight = CGFloat(0.0)
+    private var _chartWidth = CGFloat(0.0)
+    private var _chartHeight = CGFloat(0.0)
     
     /// minimum scale value on the y-axis
-    fileprivate var _minScaleY = CGFloat(1.0)
+    private var _minScaleY = CGFloat(1.0)
     
     /// maximum scale value on the y-axis
-    fileprivate var _maxScaleY = CGFloat.greatestFiniteMagnitude
+    private var _maxScaleY = CGFloat.greatestFiniteMagnitude
     
     /// minimum scale value on the x-axis
-    fileprivate var _minScaleX = CGFloat(1.0)
+    private var _minScaleX = CGFloat(1.0)
     
     /// maximum scale value on the x-axis
-    fileprivate var _maxScaleX = CGFloat.greatestFiniteMagnitude
+    private var _maxScaleX = CGFloat.greatestFiniteMagnitude
     
     /// contains the current scale factor of the x-axis
-    fileprivate var _scaleX = CGFloat(1.0)
+    private var _scaleX = CGFloat(1.0)
     
     /// contains the current scale factor of the y-axis
-    fileprivate var _scaleY = CGFloat(1.0)
+    private var _scaleY = CGFloat(1.0)
     
     /// current translation (drag distance) on the x-axis
-    fileprivate var _transX = CGFloat(0.0)
+    private var _transX = CGFloat(0.0)
     
     /// current translation (drag distance) on the y-axis
-    fileprivate var _transY = CGFloat(0.0)
+    private var _transY = CGFloat(0.0)
     
     /// offset that allows the chart to be dragged over its bounds on the x-axis
-    fileprivate var _transOffsetX = CGFloat(0.0)
+    private var _transOffsetX = CGFloat(0.0)
     
     /// offset that allows the chart to be dragged over its bounds on the x-axis
-    fileprivate var _transOffsetY = CGFloat(0.0)
-    
-    public override init()
-    {
-    }
+    private var _transOffsetY = CGFloat(0.0)
     
     /// Constructor - don't forget calling setChartDimens(...)
-    public init(width: CGFloat, height: CGFloat)
+    @objc public init(width: CGFloat, height: CGFloat)
     {
         super.init()
         
         setChartDimens(width: width, height: height)
     }
     
-    open func setChartDimens(width: CGFloat, height: CGFloat)
+    @objc open func setChartDimens(width: CGFloat, height: CGFloat)
     {
         let offsetLeft = self.offsetLeft
         let offsetTop = self.offsetTop
@@ -80,7 +76,7 @@ open class ViewPortHandler: NSObject
         restrainViewPort(offsetLeft: offsetLeft, offsetTop: offsetTop, offsetRight: offsetRight, offsetBottom: offsetBottom)
     }
     
-    open var hasChartDimens: Bool
+    @objc open var hasChartDimens: Bool
     {
         if _chartHeight > 0.0 && _chartWidth > 0.0
         {
@@ -92,7 +88,7 @@ open class ViewPortHandler: NSObject
         }
     }
 
-    open func restrainViewPort(offsetLeft: CGFloat, offsetTop: CGFloat, offsetRight: CGFloat, offsetBottom: CGFloat)
+    @objc open func restrainViewPort(offsetLeft: CGFloat, offsetTop: CGFloat, offsetRight: CGFloat, offsetBottom: CGFloat)
     {
         _contentRect.origin.x = offsetLeft
         _contentRect.origin.y = offsetTop
@@ -100,72 +96,72 @@ open class ViewPortHandler: NSObject
         _contentRect.size.height = _chartHeight - offsetBottom - offsetTop
     }
     
-    open var offsetLeft: CGFloat
+    @objc open var offsetLeft: CGFloat
     {
         return _contentRect.origin.x
     }
     
-    open var offsetRight: CGFloat
+    @objc open var offsetRight: CGFloat
     {
         return _chartWidth - _contentRect.size.width - _contentRect.origin.x
     }
     
-    open var offsetTop: CGFloat
+    @objc open var offsetTop: CGFloat
     {
         return _contentRect.origin.y
     }
     
-    open var offsetBottom: CGFloat
+    @objc open var offsetBottom: CGFloat
     {
         return _chartHeight - _contentRect.size.height - _contentRect.origin.y
     }
     
-    open var contentTop: CGFloat
+    @objc open var contentTop: CGFloat
     {
         return _contentRect.origin.y
     }
     
-    open var contentLeft: CGFloat
+    @objc open var contentLeft: CGFloat
     {
         return _contentRect.origin.x
     }
     
-    open var contentRight: CGFloat
+    @objc open var contentRight: CGFloat
     {
         return _contentRect.origin.x + _contentRect.size.width
     }
     
-    open var contentBottom: CGFloat
+    @objc open var contentBottom: CGFloat
     {
         return _contentRect.origin.y + _contentRect.size.height
     }
     
-    open var contentWidth: CGFloat
+    @objc open var contentWidth: CGFloat
     {
         return _contentRect.size.width
     }
     
-    open var contentHeight: CGFloat
+    @objc open var contentHeight: CGFloat
     {
         return _contentRect.size.height
     }
     
-    open var contentRect: CGRect
+    @objc open var contentRect: CGRect
     {
         return _contentRect
     }
     
-    open var contentCenter: CGPoint
+    @objc open var contentCenter: CGPoint
     {
         return CGPoint(x: _contentRect.origin.x + _contentRect.size.width / 2.0, y: _contentRect.origin.y + _contentRect.size.height / 2.0)
     }
     
-    open var chartHeight: CGFloat
+    @objc open var chartHeight: CGFloat
     { 
         return _chartHeight
     }
     
-    open var chartWidth: CGFloat
+    @objc open var chartWidth: CGFloat
     { 
         return _chartWidth
     }
@@ -173,13 +169,13 @@ open class ViewPortHandler: NSObject
     // MARK: - Scaling/Panning etc.
     
     /// Zooms by the specified zoom factors.
-    open func zoom(scaleX: CGFloat, scaleY: CGFloat) -> CGAffineTransform
+    @objc open func zoom(scaleX: CGFloat, scaleY: CGFloat) -> CGAffineTransform
     {
         return _touchMatrix.scaledBy(x: scaleX, y: scaleY)
     }
     
     /// Zooms around the specified center
-    open func zoom(scaleX: CGFloat, scaleY: CGFloat, x: CGFloat, y: CGFloat) -> CGAffineTransform
+    @objc open func zoom(scaleX: CGFloat, scaleY: CGFloat, x: CGFloat, y: CGFloat) -> CGAffineTransform
     {
         var matrix = _touchMatrix.translatedBy(x: x, y: y)
         matrix = matrix.scaledBy(x: scaleX, y: scaleY)
@@ -188,25 +184,25 @@ open class ViewPortHandler: NSObject
     }
     
     /// Zooms in by 1.4, x and y are the coordinates (in pixels) of the zoom center.
-    open func zoomIn(x: CGFloat, y: CGFloat) -> CGAffineTransform
+    @objc open func zoomIn(x: CGFloat, y: CGFloat) -> CGAffineTransform
     {
         return zoom(scaleX: 1.4, scaleY: 1.4, x: x, y: y)
     }
     
     /// Zooms out by 0.7, x and y are the coordinates (in pixels) of the zoom center.
-    open func zoomOut(x: CGFloat, y: CGFloat) -> CGAffineTransform
+    @objc open func zoomOut(x: CGFloat, y: CGFloat) -> CGAffineTransform
     {
         return zoom(scaleX: 0.7, scaleY: 0.7, x: x, y: y)
     }
     
     /// Zooms out to original size.
-    open func resetZoom() -> CGAffineTransform
+    @objc open func resetZoom() -> CGAffineTransform
     {
         return zoom(scaleX: 1.0, scaleY: 1.0, x: 0.0, y: 0.0)
     }
     
     /// Sets the scale factor to the specified values.
-    open func setZoom(scaleX: CGFloat, scaleY: CGFloat) -> CGAffineTransform
+    @objc open func setZoom(scaleX: CGFloat, scaleY: CGFloat) -> CGAffineTransform
     {
         var matrix = _touchMatrix
         matrix.a = scaleX
@@ -215,7 +211,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// Sets the scale factor to the specified values. x and y is pivot.
-    open func setZoom(scaleX: CGFloat, scaleY: CGFloat, x: CGFloat, y: CGFloat) -> CGAffineTransform
+    @objc open func setZoom(scaleX: CGFloat, scaleY: CGFloat, x: CGFloat, y: CGFloat) -> CGAffineTransform
     {
         var matrix = _touchMatrix
         matrix.a = 1.0
@@ -227,7 +223,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// Resets all zooming and dragging and makes the chart fit exactly it's bounds.
-    open func fitScreen() -> CGAffineTransform
+    @objc open func fitScreen() -> CGAffineTransform
     {
         _minScaleX = 1.0
         _minScaleY = 1.0
@@ -236,7 +232,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// Translates to the specified point.
-    open func translate(pt: CGPoint) -> CGAffineTransform
+    @objc open func translate(pt: CGPoint) -> CGAffineTransform
     {
         let translateX = pt.x - offsetLeft
         let translateY = pt.y - offsetTop
@@ -249,18 +245,17 @@ open class ViewPortHandler: NSObject
     /// Centers the viewport around the specified position (x-index and y-value) in the chart.
     /// Centering the viewport outside the bounds of the chart is not possible.
     /// Makes most sense in combination with the setScaleMinima(...) method.
-    open func centerViewPort(pt: CGPoint, chart: ChartViewBase)
+    @objc open func centerViewPort(pt: CGPoint, chart: ChartViewBase)
     {
         let translateX = pt.x - offsetLeft
         let translateY = pt.y - offsetTop
         
         let matrix = _touchMatrix.concatenating(CGAffineTransform(translationX: -translateX, y: -translateY))
-        
-        let _ = refresh(newMatrix: matrix, chart: chart, invalidate: true)
+        refresh(newMatrix: matrix, chart: chart, invalidate: true)
     }
     
     /// call this method to refresh the graph with a given matrix
-    open func refresh(newMatrix: CGAffineTransform, chart: ChartViewBase, invalidate: Bool) -> CGAffineTransform
+    @objc @discardableResult open func refresh(newMatrix: CGAffineTransform, chart: ChartViewBase, invalidate: Bool) -> CGAffineTransform
     {
         _touchMatrix = newMatrix
         
@@ -273,7 +268,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// limits the maximum scale and X translation of the given matrix
-    fileprivate func limitTransAndScale(matrix: inout CGAffineTransform, content: CGRect?)
+    private func limitTransAndScale(matrix: inout CGAffineTransform, content: CGRect?)
     {
         // min scale-x is 1
         _scaleX = min(max(_minScaleX, matrix.a), _maxScaleX)
@@ -304,7 +299,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// Sets the minimum scale factor for the x-axis
-    open func setMinimumScaleX(_ xScale: CGFloat)
+    @objc open func setMinimumScaleX(_ xScale: CGFloat)
     {
         var newValue = xScale
         
@@ -319,7 +314,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// Sets the maximum scale factor for the x-axis
-    open func setMaximumScaleX(_ xScale: CGFloat)
+    @objc open func setMaximumScaleX(_ xScale: CGFloat)
     {
         var newValue = xScale
         
@@ -334,10 +329,10 @@ open class ViewPortHandler: NSObject
     }
     
     /// Sets the minimum and maximum scale factors for the x-axis
-    open func setMinMaxScaleX(minScaleX: CGFloat, maxScaleX: CGFloat)
+    @objc open func setMinMaxScaleX(minScaleX: CGFloat, maxScaleX: CGFloat)
     {
         var newMin = minScaleX
-        var newMax = minScaleY
+        var newMax = maxScaleX
         
         if newMin < 1.0
         {
@@ -355,7 +350,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// Sets the minimum scale factor for the y-axis
-    open func setMinimumScaleY(_ yScale: CGFloat)
+    @objc open func setMinimumScaleY(_ yScale: CGFloat)
     {
         var newValue = yScale
         
@@ -370,7 +365,7 @@ open class ViewPortHandler: NSObject
     }
     
     /// Sets the maximum scale factor for the y-axis
-    open func setMaximumScaleY(_ yScale: CGFloat)
+    @objc open func setMaximumScaleY(_ yScale: CGFloat)
     {
         var newValue = yScale
         
@@ -384,7 +379,7 @@ open class ViewPortHandler: NSObject
         limitTransAndScale(matrix: &_touchMatrix, content: _contentRect)
     }
     
-    open func setMinMaxScaleY(minScaleY: CGFloat, maxScaleY: CGFloat)
+    @objc open func setMinMaxScaleY(minScaleY: CGFloat, maxScaleY: CGFloat)
     {
         var minScaleY = minScaleY, maxScaleY = maxScaleY
         
@@ -404,154 +399,211 @@ open class ViewPortHandler: NSObject
         limitTransAndScale(matrix: &_touchMatrix, content: _contentRect)
     }
 
-    open var touchMatrix: CGAffineTransform
+    @objc open var touchMatrix: CGAffineTransform
     {
         return _touchMatrix
     }
     
     // MARK: - Boundaries Check
     
-    open func isInBoundsX(_ x: CGFloat) -> Bool
+    @objc open func isInBoundsX(_ x: CGFloat) -> Bool
     {
         return isInBoundsLeft(x) && isInBoundsRight(x)
     }
     
-    open func isInBoundsY(_ y: CGFloat) -> Bool
+    @objc open func isInBoundsY(_ y: CGFloat) -> Bool
     {
         return isInBoundsTop(y) && isInBoundsBottom(y)
     }
     
-    open func isInBounds(x: CGFloat, y: CGFloat) -> Bool
+    /**
+     A method to check whether coordinate lies within the viewport.
+     
+     - Parameters:
+         - point: a coordinate.
+     */
+    @objc open func isInBounds(point: CGPoint) -> Bool
+    {
+        return isInBounds(x: point.x, y: point.y)
+    }
+    
+    @objc open func isInBounds(x: CGFloat, y: CGFloat) -> Bool
     {
         return isInBoundsX(x) && isInBoundsY(y)
     }
     
-    open func isInBoundsLeft(_ x: CGFloat) -> Bool
+    @objc open func isInBoundsLeft(_ x: CGFloat) -> Bool
     {
         return _contentRect.origin.x <= x + 1.0
     }
     
-    open func isInBoundsRight(_ x: CGFloat) -> Bool
+    @objc open func isInBoundsRight(_ x: CGFloat) -> Bool
     {
         let x = floor(x * 100.0) / 100.0
         return (_contentRect.origin.x + _contentRect.size.width) >= x - 1.0
     }
     
-    open func isInBoundsTop(_ y: CGFloat) -> Bool
+    @objc open func isInBoundsTop(_ y: CGFloat) -> Bool
     {
         return _contentRect.origin.y <= y
     }
     
-    open func isInBoundsBottom(_ y: CGFloat) -> Bool
+    @objc open func isInBoundsBottom(_ y: CGFloat) -> Bool
     {
         let normalizedY = floor(y * 100.0) / 100.0
         return (_contentRect.origin.y + _contentRect.size.height) >= normalizedY
     }
     
-    /// - returns: The current x-scale factor
-    open var scaleX: CGFloat
+    /**
+     A method to check whether a line between two coordinates intersects with the view port  by using a linear function.
+     
+        Linear function (calculus): `y = ax + b`
+            
+        Note: this method will not check for collision with the right edge of the view port, as we assume lines run from left
+        to right (e.g. `startPoint < endPoint`).
+     
+     - Parameters:
+        - startPoint: the start coordinate of the line.
+        - endPoint: the end coordinate of the line.
+     */
+    @objc open func isIntersectingLine(from startPoint: CGPoint, to endPoint: CGPoint) -> Bool
+    {
+        // If start- and/or endpoint fall within the viewport, bail out early.
+        if isInBounds(point: startPoint) || isInBounds(point: endPoint) { return true }
+        // check if x in bound when it's a vertical line
+        if startPoint.x == endPoint.x { return isInBoundsX(startPoint.x) }
+        
+        // Calculate the slope (`a`) of the line (e.g. `a = (y2 - y1) / (x2 - x1)`).
+        let a = (endPoint.y - startPoint.y) / (endPoint.x - startPoint.x)
+        // Calculate the y-correction (`b`) of the line (e.g. `b = y1 - (a * x1)`).
+        let b = startPoint.y - (a * startPoint.x)
+        
+        // Check for colission with the left edge of the view port (e.g. `y = (a * minX) + b`).
+        // if a is 0, it's a horizontal line; checking b here is still valid, as b is `point.y` all the time
+        if isInBoundsY((a * contentRect.minX) + b) { return true }
+
+        // Skip unnecessary check for collision with the right edge of the view port
+        // (e.g. `y = (a * maxX) + b`), as such a line will either begin inside the view port,
+        // or intersect the left, top or bottom edges of the view port. Leaving this logic here for clarity's sake:
+        // if isInBoundsY((a * contentRect.maxX) + b) { return true }
+        
+        // While slope `a` can theoretically never be `0`, we should protect against division by zero.
+        guard a != 0 else { return false }
+        
+        // Check for collision with the bottom edge of the view port (e.g. `x = (maxY - b) / a`).
+        if isInBoundsX((contentRect.maxY - b) / a) { return true }
+        
+        // Check for collision with the top edge of the view port (e.g. `x = (minY - b) / a`).
+        if isInBoundsX((contentRect.minY - b) / a) { return true }
+
+        // This line does not intersect the view port.
+        return false
+    }
+    
+    /// The current x-scale factor
+    @objc open var scaleX: CGFloat
     {
         return _scaleX
     }
     
-    /// - returns: The current y-scale factor
-    open var scaleY: CGFloat
+    /// The current y-scale factor
+    @objc open var scaleY: CGFloat
     {
         return _scaleY
     }
     
-    /// - returns: The minimum x-scale factor
-    open var minScaleX: CGFloat
+    /// The minimum x-scale factor
+    @objc open var minScaleX: CGFloat
     {
         return _minScaleX
     }
     
-    /// - returns: The minimum y-scale factor
-    open var minScaleY: CGFloat
+    /// The minimum y-scale factor
+    @objc open var minScaleY: CGFloat
     {
         return _minScaleY
     }
     
-    /// - returns: The minimum x-scale factor
-    open var maxScaleX: CGFloat
+    /// The minimum x-scale factor
+    @objc open var maxScaleX: CGFloat
     {
         return _maxScaleX
     }
     
-    /// - returns: The minimum y-scale factor
-    open var maxScaleY: CGFloat
+    /// The minimum y-scale factor
+    @objc open var maxScaleY: CGFloat
     {
         return _maxScaleY
     }
     
-    /// - returns: The translation (drag / pan) distance on the x-axis
-    open var transX: CGFloat
+    /// The translation (drag / pan) distance on the x-axis
+    @objc open var transX: CGFloat
     {
         return _transX
     }
     
-    /// - returns: The translation (drag / pan) distance on the y-axis
-    open var transY: CGFloat
+    /// The translation (drag / pan) distance on the y-axis
+    @objc open var transY: CGFloat
     {
         return _transY
     }
     
     /// if the chart is fully zoomed out, return true
-    open var isFullyZoomedOut: Bool
+    @objc open var isFullyZoomedOut: Bool
     {
         return isFullyZoomedOutX && isFullyZoomedOutY
     }
     
-    /// - returns: `true` if the chart is fully zoomed out on it's y-axis (vertical).
-    open var isFullyZoomedOutY: Bool
+    /// `true` if the chart is fully zoomed out on it's y-axis (vertical).
+    @objc open var isFullyZoomedOutY: Bool
     {
         return !(_scaleY > _minScaleY || _minScaleY > 1.0)
     }
     
-    /// - returns: `true` if the chart is fully zoomed out on it's x-axis (horizontal).
-    open var isFullyZoomedOutX: Bool
+    /// `true` if the chart is fully zoomed out on it's x-axis (horizontal).
+    @objc open var isFullyZoomedOutX: Bool
     {
         return !(_scaleX > _minScaleX || _minScaleX > 1.0)
     }
     
     /// Set an offset in pixels that allows the user to drag the chart over it's bounds on the x-axis.
-    open func setDragOffsetX(_ offset: CGFloat)
+    @objc open func setDragOffsetX(_ offset: CGFloat)
     {
         _transOffsetX = offset
     }
     
     /// Set an offset in pixels that allows the user to drag the chart over it's bounds on the y-axis.
-    open func setDragOffsetY(_ offset: CGFloat)
+    @objc open func setDragOffsetY(_ offset: CGFloat)
     {
         _transOffsetY = offset
     }
     
-    /// - returns: `true` if both drag offsets (x and y) are zero or smaller.
-    open var hasNoDragOffset: Bool
+    /// `true` if both drag offsets (x and y) are zero or smaller.
+    @objc open var hasNoDragOffset: Bool
     {
         return _transOffsetX <= 0.0 && _transOffsetY <= 0.0
     }
     
-    /// - returns: `true` if the chart is not yet fully zoomed out on the x-axis
-    open var canZoomOutMoreX: Bool
+    /// `true` if the chart is not yet fully zoomed out on the x-axis
+    @objc open var canZoomOutMoreX: Bool
     {
         return _scaleX > _minScaleX
     }
     
-    /// - returns: `true` if the chart is not yet fully zoomed in on the x-axis
-    open var canZoomInMoreX: Bool
+    /// `true` if the chart is not yet fully zoomed in on the x-axis
+    @objc open var canZoomInMoreX: Bool
     {
         return _scaleX < _maxScaleX
     }
     
-    /// - returns: `true` if the chart is not yet fully zoomed out on the y-axis
-    open var canZoomOutMoreY: Bool
+    /// `true` if the chart is not yet fully zoomed out on the y-axis
+    @objc open var canZoomOutMoreY: Bool
     {
         return _scaleY > _minScaleY
     }
     
-    /// - returns: `true` if the chart is not yet fully zoomed in on the y-axis
-    open var canZoomInMoreY: Bool
+    /// `true` if the chart is not yet fully zoomed in on the y-axis
+    @objc open var canZoomInMoreY: Bool
     {
         return _scaleY < _maxScaleY
     }
diff --git a/Source/Supporting Files/Info.plist b/Source/Supporting Files/Info.plist
index e7216db431..454e6a768e 100644
--- a/Source/Supporting Files/Info.plist	
+++ b/Source/Supporting Files/Info.plist	
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/Tests/Charts/BarChartTests.swift b/Tests/Charts/BarChartTests.swift
index 60f6d8d512..c27ef6f22e 100644
--- a/Tests/Charts/BarChartTests.swift
+++ b/Tests/Charts/BarChartTests.swift
@@ -4,88 +4,413 @@ import FBSnapshotTestCase
 
 class BarChartTests: FBSnapshotTestCase
 {
-    
-    var chart: BarChartView!
-    var dataSet: BarChartDataSet!
-    
     override func setUp()
     {
         super.setUp()
         
         // Set to `true` to re-capture all snapshots
         self.recordMode = false
-        
-        // Sample data
-        let values: [Double] = [8, 104, 81, 93, 52, 44, 97, 101, 75, 28,
-            76, 25, 20, 13, 52, 44, 57, 23, 45, 91,
-            99, 14, 84, 48, 40, 71, 106, 41, 45, 61]
-        
+    }
+    
+    override func tearDown()
+    {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    //MARK: Prepare
+    func setupCustomValuesDataEntries(values: [Double]) -> [ChartDataEntry]
+    {
         var entries: [ChartDataEntry] = Array()
-        
         for (i, value) in values.enumerated()
         {
             entries.append(BarChartDataEntry(x: Double(i), y: value, icon: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
         }
-        
-        dataSet = BarChartDataSet(values: entries, label: "Bar chart unit test data")
+        return entries
+    }
+
+    func setupDefaultValuesDataEntries() -> [ChartDataEntry]
+    {
+        let values: [Double] = [8, 104, -81, 93, 52, -44, 97, 101, -75, 28,
+                                -76, 25, 20, -13, 52, 44, -57, 23, 45, -91,
+                                99, 14, -84, 48, 40, -71, 106, 41, -45, 61]
+        return setupCustomValuesDataEntries(values: values)
+    }
+
+    func setupPositiveValuesDataEntries() -> [ChartDataEntry]
+    {
+        let values: [Double] = [8, 104, 81, 93, 52, 44, 97, 101, 75, 28,
+                                76, 25, 20, 13, 52, 44, 57, 23, 45, 91,
+                                99, 14, 84, 48, 40, 71, 106, 41, 45, 61]
+        return setupCustomValuesDataEntries(values: values)
+    }
+
+    func setupNegativeValuesDataEntries() -> [ChartDataEntry]
+    {
+        let values: [Double] = [-8, -104, -81, -93, -52, -44, -97, -101, -75, -28,
+                                -76, -25, -20, -13, -52, -44, -57, -23, -45, -91,
+                                -99, -14, -84, -48, -40, -71, -106, -41, -45, -61]
+        return setupCustomValuesDataEntries(values: values)
+    }
+
+    func setupZeroValuesDataEntries() -> [ChartDataEntry]
+    {
+        let values = [Double](repeating: 0.0, count: 30)
+        return setupCustomValuesDataEntries(values: values)
+    }
+
+    func setupStackedValuesDataEntries() -> [ChartDataEntry]
+    {
+        var entries: [ChartDataEntry] = Array()
+        entries.append(BarChartDataEntry(x: 0, yValues: [28, 50, 60, 30, 42], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 1, yValues: [-20, -36, -52, -40, -15], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 2, yValues: [10, 30, 40, 90, 72], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 3, yValues: [-40, -50, -30, -60, -20], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 4, yValues: [10, 40, 60, 45, 62], icon: UIImage(named: "icon")))
+        return entries
+    }
+
+    func setupDefaultStackedDataSet(chartDataEntries: [ChartDataEntry]) -> BarChartDataSet
+    {
+        let dataSet = BarChartDataSet(entries: chartDataEntries, label: "Stacked bar chart unit test data")
+        dataSet.drawIconsEnabled = false
+        dataSet.iconsOffset = CGPoint(x: 0, y: -10.0)
+        dataSet.colors = Array(arrayLiteral:NSUIColor(red: 46/255.0, green: 204/255.0, blue: 113/255.0, alpha: 1.0),
+                               NSUIColor(red: 241/255.0, green: 196/255.0, blue: 15/255.0, alpha: 1.0),
+                               NSUIColor(red: 231/255.0, green: 76/255.0, blue: 60/255.0, alpha: 1.0),
+                               NSUIColor(red: 52/255.0, green: 152/255.0, blue: 219/255.0, alpha: 1.0)
+        )
+        return dataSet
+    }
+
+    func setupDefaultDataSet(chartDataEntries: [ChartDataEntry]) -> BarChartDataSet
+    {
+        let dataSet = BarChartDataSet(entries: chartDataEntries, label: "Bar chart unit test data")
         dataSet.drawIconsEnabled = false
         dataSet.iconsOffset = CGPoint(x: 0, y: -10.0)
+        return dataSet
+    }
 
-        let data = BarChartData(dataSet: dataSet)
+    func setupDefaultChart(dataSets: [BarChartDataSet]) -> BarChartView
+    {
+        let data = BarChartData(dataSets: dataSets)
         data.barWidth = 0.85
         
-        chart = BarChartView(frame: CGRect(x: 0, y: 0, width: 480, height: 350))
+        let chart = BarChartView(frame: CGRect(x: 0, y: 0, width: 480, height: 350))
         chart.backgroundColor = NSUIColor.clear
-        chart.leftAxis.axisMinimum = 0.0
-        chart.rightAxis.axisMinimum = 0.0
         chart.data = data
+        return chart
     }
     
-    override func tearDown()
+    //MARK: Start Test
+    func testDefaultValues()
     {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+
     }
-    
-    func testDefaultValues()
+
+    func testDefaultBarDataSetLabels()
+    {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = BarChartDataSet(entries: dataEntries)
+        dataSet.drawIconsEnabled = false
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testZeroValues()
     {
-        FBSnapshotVerifyView(chart)
+        let dataEntries = setupZeroValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
-    
+
+    func testPositiveValues()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testPositiveValuesWithCustomAxisMaximum()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMaximum = 50
+        chart.clipValuesToContentEnabled = true
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testPositiveValuesWithCustomAxisMaximum2()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMaximum = -10
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testPositiveValuesWithCustomAxisMinimum()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMinimum = 50
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testPositiveValuesWithCustomAxisMinimum2()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMinimum = 110
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testPositiveValuesWithCustomAxisMaximumAndCustomAxisMaximum()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        //If min is greater than max, then min and max will be exchanged.
+        chart.leftAxis.axisMaximum = 200
+        chart.leftAxis.axisMinimum = -10
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testNegativeValues()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testNegativeValuesWithCustomAxisMaximum()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMaximum = 10
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testNegativeValuesWithCustomAxisMaximum2()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMaximum = -150
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+
+    func testNegativeValuesWithCustomAxisMinimum()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMinimum = -200
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testNegativeValuesWithCustomAxisMinimum2()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.axisMinimum = 10
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testNegativeValuesWithCustomAxisMaximumAndCustomAxisMaximum()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        //If min is greater than max, then min and max will be exchanged.
+        chart.leftAxis.axisMaximum = 10
+        chart.leftAxis.axisMinimum = -200
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
     func testHidesValues()
     {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
         dataSet.drawValuesEnabled = false
-        FBSnapshotVerifyView(chart)
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testNotDrawValueAboveBars()
+    {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.drawValueAboveBarEnabled = false
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testStackedDrawValues()
+    {
+        let dataEntries = setupStackedValuesDataEntries()
+        let dataSet = setupDefaultStackedDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testStackedNotDrawValues()
+    {
+        let dataEntries = setupStackedValuesDataEntries()
+        let dataSet = setupDefaultStackedDataSet(chartDataEntries: dataEntries)
+        dataSet.drawValuesEnabled = false
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testStackedNotDrawValuesAboveBars()
+    {
+        let dataEntries = setupStackedValuesDataEntries()
+        let dataSet = setupDefaultStackedDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.drawValueAboveBarEnabled = false
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testHideLeftAxis()
     {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
         chart.leftAxis.enabled = false
-        FBSnapshotVerifyView(chart)
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testHideRightAxis()
     {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
         chart.rightAxis.enabled = false
-        FBSnapshotVerifyView(chart)
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testInvertedLeftAxis()
+    {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.inverted = true
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testInvertedLeftAxisWithNegativeValues()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.inverted = true
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testInvertedLeftAxisWithPositiveValues()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.leftAxis.inverted = true
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testInvertedRightAxis()
+    {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        dataSet.axisDependency = .right
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.rightAxis.inverted = true
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testInvertedRightAxisWithNegativeValues()
+    {
+        let dataEntries = setupNegativeValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        dataSet.axisDependency = .right
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.rightAxis.inverted = true
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testInvertedRightAxisWithPositiveValues()
+    {
+        let dataEntries = setupPositiveValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        dataSet.axisDependency = .right
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.rightAxis.inverted = true
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testHideHorizontalGridlines()
     {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
         chart.leftAxis.drawGridLinesEnabled = false
         chart.rightAxis.drawGridLinesEnabled = false
-        FBSnapshotVerifyView(chart)
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testHideVerticalGridlines()
     {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
         chart.xAxis.drawGridLinesEnabled = false
-        FBSnapshotVerifyView(chart)
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testDrawIcons()
     {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
         dataSet.drawIconsEnabled = true
-        FBSnapshotVerifyView(chart)
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
 }
diff --git a/Tests/Charts/ChartUtilsTests.swift b/Tests/Charts/ChartUtilsTests.swift
index 3887ac483e..9e5da3a07b 100644
--- a/Tests/Charts/ChartUtilsTests.swift
+++ b/Tests/Charts/ChartUtilsTests.swift
@@ -1,11 +1,3 @@
-//
-//  ChartUtilsTests.swift
-//  Charts
-//
-//  Created by Pierre-Marc Airoldi on 2016-09-25.
-//
-//
-
 import XCTest
 @testable import Charts
 
@@ -25,7 +17,7 @@ class ChartUtilsTests: XCTestCase {
         
         let number = Double.nan
         
-        let actual = ChartUtils.decimals(number)
+        let actual = number.decimalPlaces
         let expected = 0
         
         XCTAssertEqual(expected, actual)
@@ -35,7 +27,7 @@ class ChartUtilsTests: XCTestCase {
         
         let number = Double.infinity
         
-        let actual = ChartUtils.decimals(number)
+        let actual = number.decimalPlaces
         let expected = 0
         
         XCTAssertEqual(expected, actual)
@@ -45,7 +37,7 @@ class ChartUtilsTests: XCTestCase {
         
         let number = 0.0
         
-        let actual = ChartUtils.decimals(number)
+        let actual = number.decimalPlaces
         let expected = 0
         
         XCTAssertEqual(expected, actual)
@@ -55,7 +47,7 @@ class ChartUtilsTests: XCTestCase {
         
         let number = Double.greatestFiniteMagnitude
         
-        let actual = ChartUtils.decimals(number)
+        let actual = number.decimalPlaces
         let expected = 0
         
         XCTAssertEqual(expected, actual)
@@ -65,7 +57,7 @@ class ChartUtilsTests: XCTestCase {
         
         let number = Double.leastNormalMagnitude
         
-        let actual = ChartUtils.decimals(number)
+        let actual = number.decimalPlaces
         let expected = 310 // Don't think this is supposed to be this value maybe 0?
         
         XCTAssertEqual(expected, actual)
@@ -75,7 +67,7 @@ class ChartUtilsTests: XCTestCase {
         
         let number = 13.123123
         
-        let actual = ChartUtils.decimals(number)
+        let actual = number.decimalPlaces
         let expected = 1 // Don't think this is supposed to be this value maybe 6?
         
         XCTAssertEqual(expected, actual)
diff --git a/Tests/Charts/CombinedChartTests.swift b/Tests/Charts/CombinedChartTests.swift
new file mode 100644
index 0000000000..9c19f4dcd4
--- /dev/null
+++ b/Tests/Charts/CombinedChartTests.swift
@@ -0,0 +1,104 @@
+//
+//  CombinedChartTests.swift
+//  ChartsTests
+//
+//  Created by Xuan Liu on 14/10/2017.
+//
+
+import XCTest
+import FBSnapshotTestCase
+@testable import Charts
+
+class CombinedChartTests: FBSnapshotTestCase
+{
+    var chart: CombinedChartView!
+    var lineDataSet: LineChartDataSet!
+    var barDataSet: BarChartDataSet!
+
+    override func setUp()
+    {
+        super.setUp()
+
+        // Set to `true` to re-capture all snapshots
+        self.recordMode = false
+
+        // Sample data
+        let combinedData = CombinedChartData()
+        combinedData.barData = generateBarData()
+        combinedData.lineData = generateLineData()
+        chart = CombinedChartView(frame: CGRect(x: 0, y: 0, width: 480, height: 350))
+        chart.backgroundColor = NSUIColor.clear
+        chart.leftAxis.axisMinimum = 0.0
+        chart.rightAxis.axisMinimum = 0.0
+        chart.data = combinedData
+    }
+
+    func generateBarData() -> BarChartData
+    {
+        let values: [Double] = [8, 104, 81, 93, 52, 44, 97, 101, 75, 28,
+                                76, 25, 20, 13, 52, 44, 57, 23, 45, 91,
+                                99, 14, 84, 48, 40, 71, 106, 41, 45, 61]
+
+        var entries: [ChartDataEntry] = Array()
+
+        for (i, value) in values.enumerated()
+        {
+            entries.append(BarChartDataEntry(x: Double(i), y: value, icon: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
+        }
+
+        barDataSet = BarChartDataSet(entries: entries, label: "Bar chart unit test data")
+        barDataSet.drawIconsEnabled = false
+
+        let data = BarChartData(dataSet: barDataSet)
+        data.barWidth = 0.85
+        return data
+    }
+
+    func generateLineData() -> LineChartData
+    {
+        let values: [Double] = [0, 254, 81, 93, 52, 44, 97, 101, 75, 28,
+                                76, 25, 20, 13, 52, 44, 57, 23, 45, 91,
+                                99, 14, 84, 48, 40, 71, 106, 41, 45, 61]
+
+        var entries: [ChartDataEntry] = Array()
+
+        for (i, value) in values.enumerated()
+        {
+            entries.append(ChartDataEntry(x: Double(i), y: value, icon: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
+        }
+
+        lineDataSet = LineChartDataSet(entries: entries, label: "Line chart unit test data")
+        lineDataSet.drawIconsEnabled = false
+        return LineChartData(dataSet: lineDataSet)
+    }
+
+    override func tearDown()
+    {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    func testDefaultAxisDependency()
+    {
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testLeftRightAxisDependency()
+    {
+        lineDataSet.axisDependency = .left
+        barDataSet.axisDependency = .right
+        chart.data?.notifyDataChanged()
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testAllRightAxisDependency()
+    {
+        lineDataSet.axisDependency = .right
+        barDataSet.axisDependency = .right
+        chart.data?.notifyDataChanged()
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+}
+
diff --git a/Tests/Charts/EquatableTests.swift b/Tests/Charts/EquatableTests.swift
new file mode 100644
index 0000000000..26074aa266
--- /dev/null
+++ b/Tests/Charts/EquatableTests.swift
@@ -0,0 +1,45 @@
+//
+//  EquatableTests.swift
+//  Charts
+//
+//  Created by Jacob Christie on 2017-11-13.
+//
+
+import XCTest
+@testable import Charts
+
+class EquatableTests: XCTestCase {
+    func testChartDataEntryEquality() {
+        let image = UIImage()
+        let data = NSObject()
+        let entry1 = ChartDataEntry(x: 5, y: 3, icon: image, data: data)
+        let entry2 = ChartDataEntry(x: 5, y: 3, icon: image, data: data)
+
+        XCTAssertTrue(entry1 == entry2)
+    }
+
+    func testChartDataEntryInequality() {
+        let image = UIImage()
+        let data1 = NSObject()
+        let data2 = NSObject()
+        let entry1 = ChartDataEntry(x: 5, y: 3, icon: image, data: data1)
+        let entry2 = ChartDataEntry(x: 5, y: 9, icon: image, data: data2)
+
+        XCTAssertFalse(entry1 == entry2)
+    }
+
+    func testHighlightEquality() {
+        let high1 = Highlight(x: 5, y: 3, xPx: 1, yPx: -1, dataSetIndex: 8, stackIndex: 8, axis: .right)
+        let high2 = Highlight(x: 5, y: 3, xPx: 1, yPx: -1, dataSetIndex: 8, stackIndex: 8, axis: .right)
+
+        XCTAssertTrue(high1 == high2)
+    }
+
+    func testHighlightInequality() {
+        let high1 = Highlight(x: 5, y: 3, xPx: 1, yPx: -1, dataSetIndex: 8, stackIndex: 8, axis: .left)
+        let high2 = Highlight(x: 5, y: 3, xPx: 1, yPx: -1, dataSetIndex: 8, stackIndex: 9, axis: .left)
+
+        XCTAssertFalse(high1 == high2)
+    }
+}
+
diff --git a/Tests/Charts/HorizontalBarChartTests.swift b/Tests/Charts/HorizontalBarChartTests.swift
new file mode 100644
index 0000000000..1b67a0dd27
--- /dev/null
+++ b/Tests/Charts/HorizontalBarChartTests.swift
@@ -0,0 +1,147 @@
+//
+//  HorizontalBarChartTests.swift
+//  ChartsTests
+//
+//  Created by Xuan Liu on 2019/3/20.
+//
+
+import XCTest
+import FBSnapshotTestCase
+@testable import Charts
+
+class HorizontalBarChartTests: FBSnapshotTestCase
+{
+
+    override func setUp()
+    {
+        super.setUp()
+        // Set to `true` to re-capture all snapshots
+        self.recordMode = false
+    }
+
+    override func tearDown()
+    {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    //MARK: Prepare
+    func setupCustomValuesDataEntries(values: [Double]) -> [ChartDataEntry]
+    {
+        var entries: [ChartDataEntry] = Array()
+        for (i, value) in values.enumerated()
+        {
+            entries.append(BarChartDataEntry(x: Double(i), y: value, icon: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
+        }
+        return entries
+    }
+
+    func setupStackedvaluesDataEntries() -> [ChartDataEntry]
+    {
+        var entries: [ChartDataEntry] = Array()
+        entries.append(BarChartDataEntry(x: 0, yValues: [28, 50, 60, 30, 42], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 1, yValues: [-20, -36, -52, -40, -15], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 2, yValues: [10, 30, 40, 90, 72], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 3, yValues: [-40, -50, -30, -60, -20], icon: UIImage(named: "icon")))
+        entries.append(BarChartDataEntry(x: 4, yValues: [10, 40, 60, 45, 62], icon: UIImage(named: "icon")))
+        return entries
+    }
+
+    func setupDefaultValuesDataEntries() -> [ChartDataEntry]
+    {
+        let values: [Double] = [8, 104, -81, 93, 52, -44, 97, 101, -75, 28,
+                                -76, 25, 20, -13, 52, 44, -57, 23, 45, -91,
+                                99, 14, -84, 48, 40, -71, 106, 41, -45, 61]
+        return setupCustomValuesDataEntries(values: values)
+    }
+
+    func setupDefaultDataSet(chartDataEntries: [ChartDataEntry]) -> BarChartDataSet
+    {
+        let dataSet = BarChartDataSet(entries: chartDataEntries, label: "Bar chart unit test data")
+        dataSet.drawIconsEnabled = false
+        dataSet.iconsOffset = CGPoint(x: 0, y: -10.0)
+        return dataSet
+    }
+
+    func setupDefaultStackedDataSet(chartDataEntries: [ChartDataEntry]) -> BarChartDataSet
+    {
+        let dataSet = BarChartDataSet(entries: chartDataEntries, label: "Stacked bar chart unit test data")
+        dataSet.drawIconsEnabled = false
+        dataSet.iconsOffset = CGPoint(x: 0, y: -10.0)
+        dataSet.colors = Array(arrayLiteral:NSUIColor(red: 46/255.0, green: 204/255.0, blue: 113/255.0, alpha: 1.0),
+                               NSUIColor(red: 241/255.0, green: 196/255.0, blue: 15/255.0, alpha: 1.0),
+                               NSUIColor(red: 231/255.0, green: 76/255.0, blue: 60/255.0, alpha: 1.0),
+                               NSUIColor(red: 52/255.0, green: 152/255.0, blue: 219/255.0, alpha: 1.0)
+        )
+        return dataSet
+    }
+
+    func setupDefaultChart(dataSets: [BarChartDataSet]) -> BarChartView
+    {
+        let data = BarChartData(dataSets: dataSets)
+        data.barWidth = 0.85
+
+        let chart = HorizontalBarChartView(frame: CGRect(x: 0, y: 0, width: 480, height: 350))
+        chart.backgroundColor = NSUIColor.clear
+        chart.data = data
+        return chart
+    }
+
+    //MARK: Start Test
+    func testDefaultValues()
+    {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testHidesValues()
+    {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        dataSet.drawValuesEnabled = false
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testNotDrawValueAboveBars()
+    {
+        let dataEntries = setupDefaultValuesDataEntries()
+        let dataSet = setupDefaultDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.drawValueAboveBarEnabled = false
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testStackedDrawValues()
+    {
+        let dataEntries = setupStackedvaluesDataEntries()
+        let dataSet = setupDefaultStackedDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testStackedNotDrawValues()
+    {
+        let dataEntries = setupStackedvaluesDataEntries()
+        let dataSet = setupDefaultStackedDataSet(chartDataEntries: dataEntries)
+        dataSet.drawValuesEnabled = false
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testStackedNotDrawValuesAboveBars()
+    {
+        let dataEntries = setupStackedvaluesDataEntries()
+        let dataSet = setupDefaultStackedDataSet(chartDataEntries: dataEntries)
+        let chart = setupDefaultChart(dataSets: [dataSet])
+        chart.drawValueAboveBarEnabled = false
+        chart.notifyDataSetChanged()
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+}
diff --git a/Tests/Charts/LineChartTests.swift b/Tests/Charts/LineChartTests.swift
index 905a3922e1..98d484a54c 100755
--- a/Tests/Charts/LineChartTests.swift
+++ b/Tests/Charts/LineChartTests.swift
@@ -27,7 +27,7 @@ class LineChartTests: FBSnapshotTestCase
             entries.append(ChartDataEntry(x: Double(i), y: value, icon: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
         }
         
-        dataSet = LineChartDataSet(values: entries, label: "First unit test data")
+        dataSet = LineChartDataSet(entries: entries, label: "First unit test data")
         dataSet.drawIconsEnabled = false
         dataSet.iconsOffset = CGPoint(x: 0, y: 20.0)
 
@@ -46,36 +46,36 @@ class LineChartTests: FBSnapshotTestCase
     
     func testDefaultValues()
     {
-        FBSnapshotVerifyView(chart)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testHidesValues()
     {
         dataSet.drawValuesEnabled = false
-        FBSnapshotVerifyView(chart)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testDoesntDrawCircles()
     {
         dataSet.drawCirclesEnabled = false
-        FBSnapshotVerifyView(chart)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testIsCubic()
     {
         dataSet.mode = LineChartDataSet.Mode.cubicBezier
-        FBSnapshotVerifyView(chart)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testDoesntDrawCircleHole()
     {
         dataSet.drawCircleHoleEnabled = false
-        FBSnapshotVerifyView(chart)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
     
     func testDrawIcons()
     {
         dataSet.drawIconsEnabled = true
-        FBSnapshotVerifyView(chart)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
     }
 }
diff --git a/Tests/Charts/PieChartTests.swift b/Tests/Charts/PieChartTests.swift
new file mode 100644
index 0000000000..441823efa4
--- /dev/null
+++ b/Tests/Charts/PieChartTests.swift
@@ -0,0 +1,87 @@
+import XCTest
+import FBSnapshotTestCase
+@testable import Charts
+
+class PieChartTests: FBSnapshotTestCase
+{
+    
+    var chart: PieChartView!
+    var dataSet: PieChartDataSet!
+    
+    override func setUp()
+    {
+        super.setUp()
+        
+        // Set to `true` to re-capture all snapshots
+        self.recordMode = false
+        
+        // Sample data
+        let values: [Double] = [11, 33, 81, 52, 97, 101, 75]
+        
+        var entries: [PieChartDataEntry] = Array()
+        
+        for value in values
+        {
+            entries.append(PieChartDataEntry(value: value, icon: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
+        }
+        
+        dataSet = PieChartDataSet(entries: entries, label: "First unit test data")
+        dataSet.drawIconsEnabled = false
+        dataSet.iconsOffset = CGPoint(x: 0, y: 20.0)
+        
+        dataSet.colors = ChartColorTemplates.vordiplom()
+            + ChartColorTemplates.joyful()
+            + ChartColorTemplates.colorful()
+            + ChartColorTemplates.liberty()
+            + ChartColorTemplates.pastel()
+            + [UIColor(red: 51/255, green: 181/255, blue: 229/255, alpha: 1)]
+        
+        chart = PieChartView(frame: CGRect(x: 0, y: 0, width: 480, height: 350))
+        chart.backgroundColor = NSUIColor.clear
+        chart.centerText = "PieChart Unit Test"
+        chart.data = PieChartData(dataSet: dataSet)
+    }
+    
+    override func tearDown()
+    {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func testDefaultValues()
+    {
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+    
+    func testHidesValues()
+    {
+        dataSet.drawValuesEnabled = false
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+    
+    func testDrawIcons()
+    {
+        dataSet.drawIconsEnabled = true
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+    
+    func testHideCenterLabel()
+    {
+        chart.drawCenterTextEnabled = false
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testHighlightDisabled()
+    {
+        chart.data?.dataSets[0].highlightEnabled = false
+        chart.highlightValue(x: 1.0, dataSetIndex: 0, callDelegate: false)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+
+    func testHighlightEnabled()
+    {
+        // by default, it's enabled
+        chart.highlightValue(x: 1.0, dataSetIndex: 0, callDelegate: false)
+        ChartsSnapshotVerifyView(chart, identifier: Snapshot.identifier(UIScreen.main.bounds.size), overallTolerance: Snapshot.tolerance)
+    }
+}
diff --git a/Tests/Charts/Snapshot.swift b/Tests/Charts/Snapshot.swift
new file mode 100644
index 0000000000..bc1c28cf4e
--- /dev/null
+++ b/Tests/Charts/Snapshot.swift
@@ -0,0 +1,29 @@
+import CoreGraphics
+import FBSnapshotTestCase
+
+public struct Snapshot
+{
+    public static let tolerance: CGFloat = 0.001
+    
+    public static func identifier(_ size: CGSize) -> String {
+        #if os(tvOS)
+        let identifier = "tvOS"
+        #elseif os(iOS)
+        let identifier = "iOS"
+        #elseif os(OSX)
+        let identifier = "macOS"
+        #else
+        let identifier = ""
+        #endif
+        
+        return "\(identifier)_\(size.width)_\(size.height)"
+    }
+}
+
+public extension FBSnapshotTestCase
+{
+    func ChartsSnapshotVerifyView(_ view: UIView, identifier: String = "", suffixes: NSOrderedSet = NSOrderedSet(object: "_64"), perPixelTolerance: CGFloat = 0, overallTolerance: CGFloat = 0, file: StaticString = #file, line: UInt = #line)
+    {
+        FBSnapshotVerifyView(view, identifier: identifier, suffixes: suffixes, perPixelTolerance: perPixelTolerance, overallTolerance: overallTolerance, file: file, line: line)
+    }
+}
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues.png
deleted file mode 100644
index 4ac538c976..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png
deleted file mode 100644
index 71fd9e89e7..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons.png
deleted file mode 100644
index 27871dd260..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons@2x.png
deleted file mode 100644
index 060cd40d4a..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines.png
deleted file mode 100644
index e055c12127..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png
deleted file mode 100644
index b367140d6c..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis.png
deleted file mode 100644
index 327eb202a0..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png
deleted file mode 100644
index ef6de921f2..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis.png
deleted file mode 100644
index 5977848ba2..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png
deleted file mode 100644
index b7d538950b..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines.png
deleted file mode 100644
index a35afaca41..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png
deleted file mode 100644
index b15802f96a..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues.png
deleted file mode 100644
index 2e49b1bca6..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png
deleted file mode 100644
index bcaaf874ee..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues.png
deleted file mode 100644
index 08d8d8fdac..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues@2x.png
deleted file mode 100644
index cd87c21500..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png
deleted file mode 100644
index 8ce85acc8d..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png
deleted file mode 100644
index 7bd64928f4..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles.png
deleted file mode 100644
index 470b8849ea..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png
deleted file mode 100644
index a5011d6508..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons.png
deleted file mode 100644
index 8bff3adcf0..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons@2x.png
deleted file mode 100644
index e6f4633903..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues.png
deleted file mode 100644
index 08d8d8fdac..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues@2x.png
deleted file mode 100644
index cd87c21500..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic.png
deleted file mode 100644
index 94545fa334..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic.png and /dev/null differ
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic@2x.png
deleted file mode 100644
index efe77c1fec..0000000000
Binary files a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultBarDataSetLabels_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultBarDataSetLabels_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..ed12b4a030
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultBarDataSetLabels_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultBarDataSetLabels_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultBarDataSetLabels_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..774b80ba50
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultBarDataSetLabels_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues.png
deleted file mode 100644
index 83ae6d3a23..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@2x.png
deleted file mode 100644
index 71fd9e89e7..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@3x.png
deleted file mode 100644
index e81eb661de..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..f37161c2dc
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..0c3753bc36
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons.png
deleted file mode 100644
index dfe9c79820..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@2x.png
deleted file mode 100644
index 1828600ac6..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@3x.png
deleted file mode 100644
index 963ab90865..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..fa118f9dc9
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..d436812f3f
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines.png
deleted file mode 100644
index ef25956cf7..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png
deleted file mode 100644
index b367140d6c..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@3x.png
deleted file mode 100644
index a5cefad832..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..3286ae7343
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..8f34ba9249
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis.png
deleted file mode 100644
index 3aed345ded..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@2x.png
deleted file mode 100644
index 460fd9b35d..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@3x.png
deleted file mode 100644
index a4139b31bf..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..97624e5799
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..0cd6395365
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis.png
deleted file mode 100644
index 88d3bd824c..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@2x.png
deleted file mode 100644
index 336c167ec1..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@3x.png
deleted file mode 100644
index 9c5b2f8716..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..183f5d9957
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..6f1f26cc12
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines.png
deleted file mode 100644
index d4cbb02c25..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png
deleted file mode 100644
index b15802f96a..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@3x.png
deleted file mode 100644
index 85ac3c6208..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..aa9c31f8ee
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..8bc1be8efa
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues.png
deleted file mode 100644
index 96452eb406..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@2x.png
deleted file mode 100644
index bcaaf874ee..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@3x.png
deleted file mode 100644
index a90f68cc7a..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..e9edc193db
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..9ff97061b2
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithNegativeValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithNegativeValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..164c274922
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithNegativeValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithNegativeValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithNegativeValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..ecd7f1f039
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithNegativeValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithPositiveValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithPositiveValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..d3a3cb6f63
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithPositiveValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithPositiveValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithPositiveValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..3efd56abda
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxisWithPositiveValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxis_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxis_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..90426d8829
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxis_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxis_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxis_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..88c52a1ddd
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedLeftAxis_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithNegativeValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithNegativeValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..bdb9e2e393
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithNegativeValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithNegativeValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithNegativeValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..d040175809
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithNegativeValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithPositiveValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithPositiveValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..71d44dd75c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithPositiveValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithPositiveValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithPositiveValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..88974cc04a
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxisWithPositiveValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxis_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxis_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..6df80b26a5
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxis_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxis_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxis_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..23bf75fb63
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testInvertedRightAxis_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum2_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum2_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..6958d3adc8
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum2_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum2_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum2_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..15b171c9ab
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum2_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximumAndCustomAxisMaximum_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximumAndCustomAxisMaximum_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..ebf463b774
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximumAndCustomAxisMaximum_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximumAndCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximumAndCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..a7783dfc5d
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximumAndCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..5d53732954
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..d3259c2754
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum2_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum2_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..678b86f67b
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum2_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum2_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum2_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..22e3d6681a
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum2_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..f9c1a2915f
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..d58e9f0e19
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValuesWithCustomAxisMinimum_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..263c6fdb11
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..8f8931a9ee
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNegativeValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNotDrawValueAboveBars_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNotDrawValueAboveBars_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..2cd95fcd29
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNotDrawValueAboveBars_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNotDrawValueAboveBars_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNotDrawValueAboveBars_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..f78d593abc
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testNotDrawValueAboveBars_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum2_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum2_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..492ba243e7
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum2_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum2_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum2_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..3a302b11ef
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum2_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximumAndCustomAxisMaximum_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximumAndCustomAxisMaximum_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..bd9997596f
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximumAndCustomAxisMaximum_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximumAndCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximumAndCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..b21e7efb19
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximumAndCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..5e9eaa550c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..e50fd51a6e
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMaximum_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum2_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum2_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..d46682b1cd
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum2_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum2_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum2_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..3dbb3abeba
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum2_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..405978378b
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..fcd79d809a
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValuesWithCustomAxisMinimum_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..0a30c8668c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..a3b6d33cf2
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testPositiveValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedDrawValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedDrawValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..6af925dcdf
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedDrawValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedDrawValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedDrawValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..26d05bd632
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedDrawValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValuesAboveBars_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValuesAboveBars_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..e4bb0d9ee3
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValuesAboveBars_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValuesAboveBars_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValuesAboveBars_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..0de93883fd
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValuesAboveBars_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..9cc9abe59a
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..b54f6c4335
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testStackedNotDrawValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testZeroValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testZeroValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..0267597461
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testZeroValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testZeroValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testZeroValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..9e29303ea9
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testZeroValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..de7f99f3c7
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..706f6598ab
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testAllRightAxisDependency_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..de7f99f3c7
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..706f6598ab
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testDefaultAxisDependency_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..9637196675
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..4a9d5f683f
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.CombinedChartTests/testLeftRightAxisDependency_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testDefaultValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testDefaultValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..67bae60fc9
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testDefaultValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..cfa81c6b27
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testHidesValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testHidesValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..90e0e89231
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testHidesValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..370e141b82
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testNotDrawValueAboveBars_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testNotDrawValueAboveBars_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..66fbc7f45a
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testNotDrawValueAboveBars_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testNotDrawValueAboveBars_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testNotDrawValueAboveBars_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..2b8e7ef5e4
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testNotDrawValueAboveBars_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedDrawValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedDrawValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..60c8c2e363
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedDrawValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedDrawValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedDrawValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..e04192c0df
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedDrawValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValuesAboveBars_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValuesAboveBars_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..697cfae5b7
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValuesAboveBars_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValuesAboveBars_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValuesAboveBars_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..e6a04a8123
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValuesAboveBars_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..08b18724c6
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..2969600354
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.HorizontalBarChartTests/testStackedNotDrawValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues.png
deleted file mode 100644
index 2fd36c711a..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@2x.png
deleted file mode 100644
index 3efb481fb9..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@3x.png
deleted file mode 100644
index 7e50eb1b6c..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..0bcfa84a8c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..94c78ed3e8
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png
deleted file mode 100644
index bb65d3f4f2..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png
deleted file mode 100644
index 23ae62f69e..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@3x.png
deleted file mode 100644
index cbb40ce7ef..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..ed42d1740f
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..8f51194b2e
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles.png
deleted file mode 100644
index 8bda2c3b9d..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png
deleted file mode 100644
index 5398735777..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@3x.png
deleted file mode 100644
index 13104e3dad..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..8ff11365ca
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..733cf574ef
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons.png
deleted file mode 100644
index e1a622165a..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@2x.png
deleted file mode 100644
index e48a938124..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@3x.png
deleted file mode 100644
index d5933cdd8c..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..233cdd31fc
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..a42b7e83cf
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues.png
deleted file mode 100644
index 304021cc7b..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues@2x.png
deleted file mode 100644
index 31c9a51a7c..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues@3x.png
deleted file mode 100644
index 66895ee993..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..df7f9637db
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..4539e71aac
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic.png
deleted file mode 100644
index d958f867d8..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@2x.png
deleted file mode 100644
index 886c224909..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@2x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@3x.png
deleted file mode 100644
index ef43dded64..0000000000
Binary files a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@3x.png and /dev/null differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..17ffc30cbe
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..a930e41f3c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDefaultValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDefaultValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..231fbbbe2c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDefaultValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..005701e06d
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDefaultValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDrawIcons_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDrawIcons_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..d9068109d8
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDrawIcons_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..4ff0b1afb4
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testDrawIcons_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHideCenterLabel_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHideCenterLabel_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..d71579a46e
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHideCenterLabel_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHideCenterLabel_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHideCenterLabel_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..bb58d49f04
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHideCenterLabel_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHidesValues_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHidesValues_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..9cc8ca4e03
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHidesValues_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..5bf07c7a0d
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHidesValues_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightDisabled_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightDisabled_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..231fbbbe2c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightDisabled_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightDisabled_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightDisabled_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..005701e06d
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightDisabled_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightEnabled_iOS_375_0_667_0@2x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightEnabled_iOS_375_0_667_0@2x.png
new file mode 100644
index 0000000000..3d9608c435
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightEnabled_iOS_375_0_667_0@2x.png differ
diff --git a/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightEnabled_tvOS_1920_0_1080_0@1x.png b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightEnabled_tvOS_1920_0_1080_0@1x.png
new file mode 100644
index 0000000000..b4adb17e3c
Binary files /dev/null and b/Tests/ReferenceImages_64/ChartsTests.PieChartTests/testHighlightEnabled_tvOS_1920_0_1080_0@1x.png differ
diff --git a/Charts/ChartsTests/Media.xcassets/Contents.json b/Tests/Supporting Files/Media.xcassets/Contents.json
similarity index 100%
rename from Charts/ChartsTests/Media.xcassets/Contents.json
rename to Tests/Supporting Files/Media.xcassets/Contents.json
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/Contents.json b/Tests/Supporting Files/Media.xcassets/icon.imageset/Contents.json
similarity index 100%
rename from Charts/ChartsTests/Media.xcassets/icon.imageset/Contents.json
rename to Tests/Supporting Files/Media.xcassets/icon.imageset/Contents.json
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/star-1.png b/Tests/Supporting Files/Media.xcassets/icon.imageset/star-1.png
similarity index 100%
rename from Charts/ChartsTests/Media.xcassets/icon.imageset/star-1.png
rename to Tests/Supporting Files/Media.xcassets/icon.imageset/star-1.png
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/star-2.png b/Tests/Supporting Files/Media.xcassets/icon.imageset/star-2.png
similarity index 100%
rename from Charts/ChartsTests/Media.xcassets/icon.imageset/star-2.png
rename to Tests/Supporting Files/Media.xcassets/icon.imageset/star-2.png
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/star.png b/Tests/Supporting Files/Media.xcassets/icon.imageset/star.png
similarity index 100%
rename from Charts/ChartsTests/Media.xcassets/icon.imageset/star.png
rename to Tests/Supporting Files/Media.xcassets/icon.imageset/star.png
diff --git a/scripts/copy-carthage-frameworks.sh b/scripts/copy-carthage-frameworks.sh
index fe47804c64..435f2c32ea 100755
--- a/scripts/copy-carthage-frameworks.sh
+++ b/scripts/copy-carthage-frameworks.sh
@@ -11,7 +11,7 @@ esac
 for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do
     VAR=SCRIPT_INPUT_FILE_$n
     framework=$(basename "${!VAR}")
-    export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework".framework
+    export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework"
 done
 
 /usr/local/bin/carthage copy-frameworks || exit