Merge pull request #7 from Bea87/betz

Merge pull request #6 from Bea87/master
Merge pull request #8 from Bea87/master

update