Merge pull request #10 from Daytron/master

Merge pull request #1 from novoselrok/master