update for 0.3.1
change to return singleton object.