Merge pull request #3 from fomistoklus/master

Master
Merge pull request #4 from fomistoklus/testing

Merge pull request #3 from fomistoklus/master