Use new methods for saving and parsing
Merge pull request #85 from chdemko/master

Use new methods for saving and parsing