Merge pull request #1 from xw2423/master

2013-07-19