Added to @author tag
Fixed it so the singleton pattern would work