Fix bugs on recorder
Merge pull request #14 from jyek/master

Fix bugs on recorder