Merge pull request #1 from ivo87/feature-1

#1
zmena