Merge pull request #27 from olga-jane/master

update from origin