Merge pull request #734 from omaciel/master

Wait for process before checking system for custom information