Merge pull request #1 from yushan87/master

Changes to the workspace