Merge pull request #1 from mvala/master

Init commit