Small draft
Merge pull request #2 from mvala/master

Small draft