Use save-current-buffer and with-current-buffer
Merge pull request #2 from mina86/master

Use built-in functions rather then cooking them oneself.