Added timeout parameter to core.process
Test, test, test
Fixed merge conflict
Merge pull request #1072 from brooksryba/develop

Develop