Merge pull request #19 from olga-jane/master

update from origin