First version
Merge pull request #1 from golicar/master

First version