oh my god on Watershed last scene

oh my god, if your seen the last few minutes of Castle's episode Watershed you got a shock of a lifetime. Castle asking Beckett to marry him and using her full name, too. I fell off my couch with the popcorn going on to the floor. Andrew W. Marlowe keep surprise us, can't wait for fall (September 2013). I hope that Castle cast will be at this years Comic Con, please ABC.