Merge pull request #4 from ViktorKad/master

--