Merge pull request #1 from fabric-engine/calder

Fabric Engine: Calder
Don't hang when restarting process
Merge pull request #1 from pzion/master

Don't hang when restarting process