fix race conditions#21

Open

michalgm wants to merge 2 commits intoglejeune:masterfrom

michalgm:fix-race-conditions

Commits on Apr 2, 2015

fix race conditions
michalgm
committed

Commits on Apr 12, 2015

move eval to exit callback
michalgm
committed