Merge pull request #7 from josefmonje/master

new pull request