Merge pull request #2 from pribilstan/master

j