Merge pull request #2 from SilentException/master

Playback improvements
added local resolver