Merge pull request #1 from olekukonko/master

Updated