Merge pull request #1 from zgemba/master

Pull
Klemen
Merge pull request #1 from LGBlueDragon/master

Pull