2013.10.21.10.54

Second Commit
2013.10.21.11.01-Ray

Third Commit
Merge remote-tracking branch 'origin/Ray'