diff --git a/dist/rough.2.0.js b/dist/rough.2.0.js
index 413298a..f367da9 100644
--- a/dist/rough.2.0.js
+++ b/dist/rough.2.0.js
@@ -244,7 +244,7 @@ class RoughRenderer {
   }
 
   ellipse(x, y, width, height, o) {
-    const increment = (Math.PI / 2) / o.curveStepCount;
+    const increment = (Math.PI * 2) / o.curveStepCount;
     let rx = Math.abs(width / 2);
     let ry = Math.abs(height / 2);
     rx += this._getOffset(-rx * 0.05, rx * 0.05, o);
@@ -313,12 +313,60 @@ class RoughRenderer {
     return { type: 'path', ops };
   }
 
+  hachureFillEllipse(cx, cy, width, height, o) {
+    let ops = [];
+    let rx = Math.abs(width / 2);
+    let ry = Math.abs(height / 2);
+    rx += this._getOffset(-rx * 0.05, rx * 0.05, o);
+    ry += this._getOffset(-ry * 0.05, ry * 0.05, o);
+    let angle = o.hachureAngle;
+    let gap = o.hachureGap;
+    if (gap <= 0) {
+      gap = o.strokeWidth * 4;
+    }
+    let fweight = o.fillWeight;
+    if (fweight < 0) {
+      fweight = o.strokeWidth / 2;
+    }
+    const radPerDeg = Math.PI / 180;
+    let hachureAngle = (angle % 180) * radPerDeg;
+    let tanAngle = Math.tan(hachureAngle);
+    let aspectRatio = ry / rx;
+    let hyp = Math.sqrt(aspectRatio * tanAngle * aspectRatio * tanAngle + 1);
+    let sinAnglePrime = aspectRatio * tanAngle / hyp;
+    let cosAnglePrime = 1 / hyp;
+    let gapPrime = gap / ((rx * ry / Math.sqrt((ry * cosAnglePrime) * (ry * cosAnglePrime) + (rx * sinAnglePrime) * (rx * sinAnglePrime))) / rx);
+    let halfLen = Math.sqrt((rx * rx) - (cx - rx + gapPrime) * (cx - rx + gapPrime));
+    for (var xPos = cx - rx + gapPrime; xPos < cx + rx; xPos += gapPrime) {
+      halfLen = Math.sqrt((rx * rx) - (cx - xPos) * (cx - xPos));
+      let p1 = this._affine(xPos, cy - halfLen, cx, cy, sinAnglePrime, cosAnglePrime, aspectRatio);
+      let p2 = this._affine(xPos, cy + halfLen, cx, cy, sinAnglePrime, cosAnglePrime, aspectRatio);
+      const o1 = this._line(p1[0], p1[1], p2[0], p2[1], o, true, false);
+      const o2 = this._line(p1[0], p1[1], p2[0], p2[1], o, true, true);
+      ops = ops.concat(o1, o2);
+    }
+    return { type: 'path', ops };
+  }
+
   // privates
 
   _getOffset(min, max, ops) {
     return ops.roughness * ((Math.random() * (max - min)) + min);
   }
 
+  _affine(x, y, cx, cy, sinAnglePrime, cosAnglePrime, R) {
+    var A = -cx * cosAnglePrime - cy * sinAnglePrime + cx;
+    var B = R * (cx * sinAnglePrime - cy * cosAnglePrime) + cy;
+    var C = cosAnglePrime;
+    var D = sinAnglePrime;
+    var E = -R * sinAnglePrime;
+    var F = R * cosAnglePrime;
+    return [
+      A + C * x + D * y,
+      B + E * x + F * y
+    ];
+  }
+
   _line(x1, y1, x2, y2, o, move, overlay) {
     const lengthSq = Math.pow((x1 - x2), 2) + Math.pow((y1 - y2), 2);
     let offset = o.maxRandomnessOffset || 0;
@@ -496,9 +544,6 @@ class RoughCanvas {
   async rectangle(x, y, width, height, options) {
     let o = this._options(options);
     let lib = await this.lib();
-    let drawing = await lib.rectangle(x, y, width, height, o);
-
-    // fill
     if (o.fill) {
       let ctx = this.ctx;
       const xc = [x, x + width, x + width, x];
@@ -511,13 +556,22 @@ class RoughCanvas {
         this._fillSketch(ctx, fillShape, o);
       }
     }
-
+    let drawing = await lib.rectangle(x, y, width, height, o);
     this._draw(this.ctx, drawing, o);
   }
 
   async ellipse(x, y, width, height, options) {
     let o = this._options(options);
     let lib = await this.lib();
+    if (o.fill) {
+      if (o.fillStyle === 'solid') {
+        let fillShape = await lib.ellipse(x, y, width, height, o);
+        this._fill(this.ctx, fillShape, o);
+      } else {
+        let fillShape = await lib.hachureFillEllipse(x, y, width, height, o);
+        this._fillSketch(this.ctx, fillShape, o);
+      }
+    }
     let drawing = await lib.ellipse(x, y, width, height, o);
     this._draw(this.ctx, drawing, o);
   }
@@ -553,6 +607,7 @@ class RoughCanvas {
   _fill(ctx, drawing, o) {
     ctx.save();
     ctx.fillStyle = o.fill;
+    drawing.type = 'fillPath';
     this._drawToContext(ctx, drawing, o);
     ctx.restore();
   }
diff --git a/examples/2.0/test.html b/examples/2.0/test.html
index b616c1b..6afed49 100644
--- a/examples/2.0/test.html
+++ b/examples/2.0/test.html
@@ -33,7 +33,13 @@
       });
 
       await rough.ellipse(350, 50, 150, 80);
-      await rough.ellipse(480, 50, 80, 80);
+      await rough.ellipse(480, 50, 80, 80, {
+        stroke: 'red', strokeWidth: 2,
+        fill: 'rgba(0,255,0,0.3)', fillStyle: 'solid'
+      });
+      await rough.ellipse(610, 50, 150, 80, {
+        fill: 'blue'
+      });
     })();
   </script>
 </body>
diff --git a/src2/canvas.js b/src2/canvas.js
index 27c5a15..898afa4 100644
--- a/src2/canvas.js
+++ b/src2/canvas.js
@@ -44,9 +44,6 @@ export default class RoughCanvas {
   async rectangle(x, y, width, height, options) {
     let o = this._options(options);
     let lib = await this.lib();
-    let drawing = await lib.rectangle(x, y, width, height, o);
-
-    // fill
     if (o.fill) {
       let ctx = this.ctx;
       const xc = [x, x + width, x + width, x];
@@ -59,13 +56,22 @@ export default class RoughCanvas {
         this._fillSketch(ctx, fillShape, o);
       }
     }
-
+    let drawing = await lib.rectangle(x, y, width, height, o);
     this._draw(this.ctx, drawing, o);
   }
 
   async ellipse(x, y, width, height, options) {
     let o = this._options(options);
     let lib = await this.lib();
+    if (o.fill) {
+      if (o.fillStyle === 'solid') {
+        let fillShape = await lib.ellipse(x, y, width, height, o);
+        this._fill(this.ctx, fillShape, o);
+      } else {
+        let fillShape = await lib.hachureFillEllipse(x, y, width, height, o);
+        this._fillSketch(this.ctx, fillShape, o);
+      }
+    }
     let drawing = await lib.ellipse(x, y, width, height, o);
     this._draw(this.ctx, drawing, o);
   }
@@ -101,6 +107,7 @@ export default class RoughCanvas {
   _fill(ctx, drawing, o) {
     ctx.save();
     ctx.fillStyle = o.fill;
+    drawing.type = 'fillPath';
     this._drawToContext(ctx, drawing, o);
     ctx.restore();
   }
diff --git a/src2/core/renderer.js b/src2/core/renderer.js
index 4736e9e..1ab5618 100644
--- a/src2/core/renderer.js
+++ b/src2/core/renderer.js
@@ -43,7 +43,7 @@ export class RoughRenderer {
   }
 
   ellipse(x, y, width, height, o) {
-    const increment = (Math.PI / 2) / o.curveStepCount;
+    const increment = (Math.PI * 2) / o.curveStepCount;
     let rx = Math.abs(width / 2);
     let ry = Math.abs(height / 2);
     rx += this._getOffset(-rx * 0.05, rx * 0.05, o);
@@ -112,12 +112,60 @@ export class RoughRenderer {
     return { type: 'path', ops };
   }
 
+  hachureFillEllipse(cx, cy, width, height, o) {
+    let ops = [];
+    let rx = Math.abs(width / 2);
+    let ry = Math.abs(height / 2);
+    rx += this._getOffset(-rx * 0.05, rx * 0.05, o);
+    ry += this._getOffset(-ry * 0.05, ry * 0.05, o);
+    let angle = o.hachureAngle;
+    let gap = o.hachureGap;
+    if (gap <= 0) {
+      gap = o.strokeWidth * 4;
+    }
+    let fweight = o.fillWeight;
+    if (fweight < 0) {
+      fweight = o.strokeWidth / 2;
+    }
+    const radPerDeg = Math.PI / 180;
+    let hachureAngle = (angle % 180) * radPerDeg;
+    let tanAngle = Math.tan(hachureAngle);
+    let aspectRatio = ry / rx;
+    let hyp = Math.sqrt(aspectRatio * tanAngle * aspectRatio * tanAngle + 1);
+    let sinAnglePrime = aspectRatio * tanAngle / hyp;
+    let cosAnglePrime = 1 / hyp;
+    let gapPrime = gap / ((rx * ry / Math.sqrt((ry * cosAnglePrime) * (ry * cosAnglePrime) + (rx * sinAnglePrime) * (rx * sinAnglePrime))) / rx);
+    let halfLen = Math.sqrt((rx * rx) - (cx - rx + gapPrime) * (cx - rx + gapPrime));
+    for (var xPos = cx - rx + gapPrime; xPos < cx + rx; xPos += gapPrime) {
+      halfLen = Math.sqrt((rx * rx) - (cx - xPos) * (cx - xPos));
+      let p1 = this._affine(xPos, cy - halfLen, cx, cy, sinAnglePrime, cosAnglePrime, aspectRatio);
+      let p2 = this._affine(xPos, cy + halfLen, cx, cy, sinAnglePrime, cosAnglePrime, aspectRatio);
+      const o1 = this._line(p1[0], p1[1], p2[0], p2[1], o, true, false);
+      const o2 = this._line(p1[0], p1[1], p2[0], p2[1], o, true, true);
+      ops = ops.concat(o1, o2);
+    }
+    return { type: 'path', ops };
+  }
+
   // privates
 
   _getOffset(min, max, ops) {
     return ops.roughness * ((Math.random() * (max - min)) + min);
   }
 
+  _affine(x, y, cx, cy, sinAnglePrime, cosAnglePrime, R) {
+    var A = -cx * cosAnglePrime - cy * sinAnglePrime + cx;
+    var B = R * (cx * sinAnglePrime - cy * cosAnglePrime) + cy;
+    var C = cosAnglePrime;
+    var D = sinAnglePrime;
+    var E = -R * sinAnglePrime;
+    var F = R * cosAnglePrime;
+    return [
+      A + C * x + D * y,
+      B + E * x + F * y
+    ];
+  }
+
   _line(x1, y1, x2, y2, o, move, overlay) {
     const lengthSq = Math.pow((x1 - x2), 2) + Math.pow((y1 - y2), 2);
     let offset = o.maxRandomnessOffset || 0;