Small changes
Merge pull request #24 from filinep/rewrite

Small changes