Changes to accomodate hackage. Upload to hackage!