after review
Merge pull request #70 from missdora/master

after review