Updated for Julia 0.3