Prevent go out of the workspace... fix issue #425.
Merge pull request #433 from evertton/master

Prevent go out of the workspace... fix issue #425.