Merge pull request #6 from Bea87/master

update