diff --git a/elements/Circle.js b/elements/Circle.js
index 78aea4b9..0e333f2e 100644
--- a/elements/Circle.js
+++ b/elements/Circle.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Circle";
diff --git a/elements/Ellipse.js b/elements/Ellipse.js
index 1824a61c..4e9668a3 100644
--- a/elements/Ellipse.js
+++ b/elements/Ellipse.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Ellipse";
diff --git a/elements/G.js b/elements/G.js
index b886f2f5..490a52c3 100644
--- a/elements/G.js
+++ b/elements/G.js
@@ -1,9 +1,9 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
 import { extractFont } from "../lib/extract/extractText";
 import extractTransform from "../lib/extract/extractTransform";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "G";
diff --git a/elements/Image.js b/elements/Image.js
index c74896fe..4a365dd6 100644
--- a/elements/Image.js
+++ b/elements/Image.js
@@ -1,8 +1,8 @@
 import React from "react";
 import { Image, requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import { meetOrSliceTypes, alignEnum } from "../lib/extract/extractViewBox";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 const spacesRegExp = /\s+/;
 
diff --git a/elements/Line.js b/elements/Line.js
index cc4f9bcb..2b156d95 100644
--- a/elements/Line.js
+++ b/elements/Line.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Line";
diff --git a/elements/LinearGradient.js b/elements/LinearGradient.js
index 5784cf3a..3614f2c0 100644
--- a/elements/LinearGradient.js
+++ b/elements/LinearGradient.js
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import extractGradient from "../lib/extract/extractGradient";
 import { requireNativeComponent } from "react-native";
+import extractGradient from "../lib/extract/extractGradient";
 
 export default class extends Component {
     static displayName = "LinearGradient";
diff --git a/elements/Mask.js b/elements/Mask.js
index 4dd61226..66ffad78 100644
--- a/elements/Mask.js
+++ b/elements/Mask.js
@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
-import units from "../lib/units";
 import extractTransform from "../lib/extract/extractTransform";
+import units from "../lib/units";
 
 export default class extends Component {
     static displayName = "Mask";
diff --git a/elements/Path.js b/elements/Path.js
index cb18684e..812ab485 100644
--- a/elements/Path.js
+++ b/elements/Path.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Path";
diff --git a/elements/Pattern.js b/elements/Pattern.js
index 0ee1aab9..fd0cab6a 100644
--- a/elements/Pattern.js
+++ b/elements/Pattern.js
@@ -1,8 +1,8 @@
 import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
-import units from "../lib/units";
 import extractTransform from "../lib/extract/extractTransform";
 import extractViewBox from "../lib/extract/extractViewBox";
+import units from "../lib/units";
 
 export default class extends Component {
     static displayName = "Pattern";
diff --git a/elements/Polygon.js b/elements/Polygon.js
index 14e4c8e3..5703ebbb 100644
--- a/elements/Polygon.js
+++ b/elements/Polygon.js
@@ -1,7 +1,7 @@
 import React from "react";
 import Path from "./Path";
-import extractPolyPoints from "../lib/extract/extractPolyPoints";
 import Shape from "./Shape";
+import extractPolyPoints from "../lib/extract/extractPolyPoints";
 
 export default class extends Shape {
     static displayName = "Polygon";
diff --git a/elements/Polyline.js b/elements/Polyline.js
index 7529c3d4..25468203 100644
--- a/elements/Polyline.js
+++ b/elements/Polyline.js
@@ -1,7 +1,7 @@
 import React from "react";
 import Path from "./Path";
-import extractPolyPoints from "../lib/extract/extractPolyPoints";
 import Shape from "./Shape";
+import extractPolyPoints from "../lib/extract/extractPolyPoints";
 
 export default class extends Shape {
     static displayName = "Polyline";
diff --git a/elements/RadialGradient.js b/elements/RadialGradient.js
index d0691ec2..cc021359 100644
--- a/elements/RadialGradient.js
+++ b/elements/RadialGradient.js
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import extractGradient from "../lib/extract/extractGradient";
 import { requireNativeComponent } from "react-native";
+import extractGradient from "../lib/extract/extractGradient";
 
 export default class extends Component {
     static displayName = "RadialGradient";
diff --git a/elements/Rect.js b/elements/Rect.js
index d86527b8..242dcfcf 100644
--- a/elements/Rect.js
+++ b/elements/Rect.js
@@ -1,5 +1,4 @@
 import React from "react";
-import "./Path"; // must import Path first, don`t know why. without this will throw an `Super expression must either be null or a function, not undefined`
 import { requireNativeComponent } from "react-native";
 import extractProps from "../lib/extract/extractProps";
 import Shape from "./Shape";
diff --git a/elements/Symbol.js b/elements/Symbol.js
index 50680757..805684ac 100644
--- a/elements/Symbol.js
+++ b/elements/Symbol.js
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import extractViewBox from "../lib/extract/extractViewBox";
 import { requireNativeComponent } from "react-native";
+import extractViewBox from "../lib/extract/extractViewBox";
 
 export default class extends Component {
     static displayName = "Symbol";
diff --git a/elements/TSpan.js b/elements/TSpan.js
index c2dc82b8..05822982 100644
--- a/elements/TSpan.js
+++ b/elements/TSpan.js
@@ -1,10 +1,10 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import extractText, { setTSpan } from "../lib/extract/extractText";
 import extractProps from "../lib/extract/extractProps";
 import extractTransform from "../lib/extract/extractTransform";
-import Shape from "./Shape";
+import extractText, { setTSpan } from "../lib/extract/extractText";
 import { pickNotNil } from "../lib/util";
+import Shape from "./Shape";
 
 export default class TSpan extends Shape {
     static displayName = "TSpan";
diff --git a/elements/TextPath.js b/elements/TextPath.js
index a6cdb018..1da703be 100644
--- a/elements/TextPath.js
+++ b/elements/TextPath.js
@@ -1,5 +1,4 @@
 import React from "react";
-
 import { requireNativeComponent } from "react-native";
 import extractText from "../lib/extract/extractText";
 import extractProps from "../lib/extract/extractProps";
diff --git a/ios/Text/RNSVGFontData.m b/ios/Text/RNSVGFontData.m
index cd843f8c..0d902ac0 100644
--- a/ios/Text/RNSVGFontData.m
+++ b/ios/Text/RNSVGFontData.m
@@ -56,10 +56,15 @@ RNSVGFontData *RNSVGFontData_Defaults;
     RNSVGFontData *data = [RNSVGFontData alloc];
     CGFloat parentFontSize = parent->fontSize;
     if ([font objectForKey:FONT_SIZE]) {
-        NSString *string = [font objectForKey:FONT_SIZE];
-        data->fontSize = [RNSVGPropHelper fromRelativeWithNSString:string
+        id fontSize = [font objectForKey:FONT_SIZE];
+        if ([fontSize isKindOfClass:NSNumber.class]) {
+            NSNumber* fs = fontSize;
+            data->fontSize = (CGFloat)[fs doubleValue];
+        } else {
+            data->fontSize = [RNSVGPropHelper fromRelativeWithNSString:fontSize
                                                        relative:parentFontSize
                                                        fontSize:parentFontSize];
+        }
     }
     else {
         data->fontSize = parentFontSize;
diff --git a/lib/extract/extractViewBox.js b/lib/extract/extractViewBox.js
index e2379bb6..fb00ac7b 100644
--- a/lib/extract/extractViewBox.js
+++ b/lib/extract/extractViewBox.js
@@ -1,10 +1,10 @@
-const meetOrSliceTypes = {
+export const meetOrSliceTypes = {
     meet: 0,
     slice: 1,
     none: 2,
 };
 
-const alignEnum = [
+export const alignEnum = [
     "xMinYMin",
     "xMidYMin",
     "xMaxYMin",
@@ -56,5 +56,3 @@ export default function(props) {
         meetOrSlice,
     };
 }
-
-export { meetOrSliceTypes, alignEnum };