Merge pull request #1 from fbelzunc/master

initial commit