Merge pull request #2 from Laverna/master

update