Merge pull request #8 from Bea87/master

update