First version
Merge pull request #1 from Jvap/master

First version