Removed some unneeded types
Added support for scalars and changed the output from Array{T,2} to Array{Array{T,1},1}