Merge pull request #4 from nicoriga/master

vbbvb