Implemented requested changes.

https://github.com/brunobraga/termsaver/pull/16#issuecomment-34623705