Merge pull request #15 from olga-jane/master

update from origin