2013.10.21.10.44

First Commit Joshua
2013.10.21.10.46

First Commit Ray
Merge remote-tracking branch 'origin/Joshua'