diff --git a/src/Math/ec.jl b/src/Math/ec.jl
index fc53c8e..f1c693f 100644
--- a/src/Math/ec.jl
+++ b/src/Math/ec.jl
@@ -2,36 +2,63 @@ module EllipticCurves
 
 # http://jeremykun.com/2014/02/08/introducing-elliptic-curves/
 # http://jeremykun.com/2014/02/24/elliptic-curves-as-python-objects/
+# http://jeremykun.com/2014/03/19/connecting-elliptic-curves-with-finite-fields-a-reprise/
 
 export curve, point
 
 import Base: +, -, *
+import Nemo: parent, divexact
 
 using AutoHashEquals
 
 
 abstract Curve{F}
 
-# Weierstrass normal form, y^2 = x^3 + ax + b
+# Weierstrass normal form, y² = x³ + ax + b
 @auto_hash_equals immutable WNFCurve{F} <: Curve{F}
     a::F
     b::F
 end
 
+# generalized Weierstrass normal form, y² + a₁xy + a₃y = x³ + a₂x² + a₄x + a₆
+@auto_hash_equals immutable GWNFCurve{F} <: Curve{F}
+    a₁::F
+    a₂::F
+    a₃::F
+    a₄::F
+    a₆::F
+end
+
 curve(a, b) = curve(promote(a, b)...)
 curve{F}(a::F, b::F) = begin
     ec = WNFCurve(a, b)
     singular(ec) && throw(DomainError())
     ec
 end
+curve(a₁, a₂, a₃, a₄, a₆) = curve(promote(a₁, a₂, a₃, a₄, a₆)...)
+curve{F}(a₁::F, a₂::F, a₃::F, a₄::F, a₆::F) = begin
+    ec = GWNFCurve(a₁, a₂, a₃, a₄, a₆)
+    singular(ec) && throw(DomainError())
+    ec
+end
 
 singular(ec::Curve) = discriminant(ec) == 0
 smooth(ec::Curve) = !singular(ec)
 
-discriminant(ec::WNFCurve) = -16 * (4 * ec.a^3 + 27 * ec.b^2)
-contains{F}(ec::WNFCurve{F}, x::F, y::F) = y^2 == x^3 + ec.a * x + ec.b
+discriminant(ec::WNFCurve) = -16 * (4*ec.a^3 + 27*ec.b^2)
+discriminant(ec::GWNFCurve) = begin
+    b₂ =   ec.a₁^2 + 4*ec.a₂
+    b₄ = 2*ec.a₄   +   ec.a₁*ec.a₃
+    b₆ =   ec.a₃^2 + 4*ec.a₆
+    b₈ = (ec.a₁^2)*ec.a₆ + 4*ec.a₂*ec.a₆ - ec.a₁*ec.a₃*ec.a₄ + ec.a₂*(ec.a₃^2) - ec.a₄^2
+    -(b₂^2)*b₈ - 8*b₄^3 - 27*b₆^2 + 9*b₂*b₄*b₆
+end
+contains{F}(ec::WNFCurve{F}, x::F, y::F) = y^2 == x^3 + ec.a*x + ec.b
+contains{F}(ec::GWNFCurve{F}, x::F, y::F) = y^2 + ec.a₁*x*y + ec.a₃*y == x^3 + ec.a₂*x^2 + ec.a₄*x + ec.a₆
 
-Base.show{F}(io::IO, ec::WNFCurve{F}) = print(io, "y^2 = x^3 + [$(ec.a)]x + [$(ec.b)]   x, y ∈ $(F)")
+parent{T<:Number}(n::T) = T
+Base.show(io::IO, ec::WNFCurve) = print(io, "y² = x³ + [$(ec.a)]x + [$(ec.b)]   x, y ∈ $(parent(ec.a))")
+Base.show(io::IO, ec::GWNFCurve) = print(io, "y² + [$(ec.a₁)]xy + [$(ec.a₃)]y == x³ + [$(ec.a₂)]x² + [$(ec.a₄)]x + [$(ec.a₆)]   x, y ∈ $(parent(ec.a₁))")
 
 
 abstract Point{C<:Curve}
@@ -62,6 +89,7 @@ samecurve{C}(p::Point{C}, q::Point{C}) = curve(p) == curve(q)
 
 -(p::IdealPoint) = p
 -{C<:WNFCurve}(p::ConcretePoint{C}) = ConcretePoint(curve(p), p.x, -p.y)
+-{C<:GWNFCurve}(p::ConcretePoint{C}) = ConcretePoint(curve(p), p.x, -p.y - curve(p).a₁ * p.x - curve(p).a₃)
 -(p::Point, q::Point) = p + (-q)
 
 +(p::Point, q::IdealPoint) = (samecurve(p, q) || throw(DomainError()); p)
@@ -72,16 +100,36 @@ samecurve{C}(p::Point{C}, q::Point{C}) = curve(p) == curve(q)
     ec = curve(p)
     if p == q
         p.y == 0 && return IdealPoint(ec)   # vertical line
-        m = (3*p.x^2 + ec.a) / (2*p.y)      # slope of the tangent line
+        m = divexact(3*p.x^2 + ec.a, 2*p.y) # slope of the tangent line
     else
         p.x == q.x && return IdealPoint(ec) # vertical line
-        m = (q.y - p.y) / (q.x - p.x)       # slope of the secant line
+        m = divexact(q.y - p.y, q.x - p.x)  # slope of the secant line
     end
 
     x = m^2 - q.x - p.x                     # using Vieta's formula for the sum of the roots
     y = m * (x - p.x) + p.y
     ConcretePoint(ec, x, -y)                # do the reflection to get the sum of the two points
 end
++{C<:GWNFCurve}(p::ConcretePoint{C}, q::ConcretePoint{C}) = begin
+    samecurve(p, q) || throw(DomainError())
+
+    ec = curve(p)
+    if p.x == q.x
+        p.y + q.y + ec.a₁*p.x + ec.a₃ == 0 && return IdealPoint(ec)
+
+        t = 2*p.y + ec.a₁*p.x + ec.a₃
+        c = divexact(3*p.x^2  + 2*ec.a₂*p.x +   ec.a₄ - ec.a₁*p.y, t)
+        d = divexact(-(p.x^3) +   ec.a₄*p.x + 2*ec.a₆ - ec.a₃*p.y, t)
+     else
+        c = divexact(q.y - p.y,         q.x - p.x)
+        d = divexact(p.y*q.x - q.y*p.x, q.x - p.x)
+    end
+
+    Σx = c^2 + ec.a₁*c - ec.a₂ - p.x - q.x
+    Σy = -(c + ec.a₁) * Σx - d - ec.a₃
+    ConcretePoint(ec, Σx, Σy)
+end
+divexact(x::Number, y::Number) = x / y
 
 *(n::Integer, p::IdealPoint) = p
 *(p::IdealPoint, n::Integer) = p