Merge pull request #3 from fomistoklus/master

Master