Merge pull request #8 from LO23/master

Update