11_6_2013_branch

please take in my change.
Dave Xu