diff --git a/blackjack.rb b/blackjack.rb
index b6dcda9..1ff5041 100644
--- a/blackjack.rb
+++ b/blackjack.rb
@@ -14,7 +14,7 @@ def value
   end
 
   def to_s
-    "#{@value}-#{suit}"
+    "#{suit[0].upcase}#{@value}"
   end
 
 end
@@ -75,6 +75,9 @@ def initialize
 
   def hit
     @player_hand.hit!(@deck)
+    if @player_hand.value > 21
+      self.stand
+    end
   end
 
   def stand
@@ -135,7 +138,7 @@ def inspect
 
   it "should be formatted nicely" do
     card = Card.new(:diamonds, "A")
-    card.to_s.should eq("A-diamonds")
+    card.to_s.should eq("DA")
   end
 end
 
@@ -225,6 +228,14 @@ def inspect
     game.status[:winner].should_not be_nil
   end
 
+  it "should stand if the player busts" do
+    game = Game.new
+    unless game.status[:player_value] < 21
+      game.hit
+    end
+    game.status[:winner].should_not nil    
+  end
+
   describe "#determine_winner" do
     it "should have dealer win when player busts" do
       Game.new.determine_winner(22, 15).should eq(:dealer)