20120815
Merge github.com:pcstarscomar/20120815