Made recorder more robust
Merge pull request #18 from jyek/master

Made recorder more robust